Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lambdas break old Androids, sigh.

This commit is contained in:
Danial Klimkin 2017-10-15 10:56:03 +02:00
parent 6c8f9bc80e
commit 77858ec8df
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
View File

@ -113,10 +113,14 @@ public class StorageErrorActivity extends AppCompatActivity {
// see PreferenceController.showChooseDataFolderDialog()
private void showChooseDataFolderDialog() {
ChooseDataFolderDialog.showDialog(this, (folder) -> {
UserPreferences.setDataFolder(folder);
leaveErrorState();
});
ChooseDataFolderDialog.showDialog(
this, new ChooseDataFolderDialog.RunnableWithString() {
@Override
public void run(final String folder) {
UserPreferences.setDataFolder(folder);
leaveErrorState();
}
});
}
public void onActivityResult(int requestCode, int resultCode, Intent data) {

21
app/src/main/java/de/danoeh/antennapod/dialog/ChooseDataFolderDialog.java
View File

@ -10,7 +10,6 @@ import com.afollestad.materialdialogs.MaterialDialog;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.preferences.UserPreferences;
@ -19,9 +18,19 @@ import de.danoeh.antennapod.core.util.StorageUtils;
public class ChooseDataFolderDialog {
public static abstract class RunnableWithString implements Runnable {
public RunnableWithString() {
super();
}
public abstract void run(final String arg);
@Override public void run() {
throw new IllegalArgumentException("Expect one String parameter.");
}
}
private ChooseDataFolderDialog() {}
public static void showDialog(final Context context, Consumer<String> handlerFunc) {
public static void showDialog(final Context context, RunnableWithString handlerFunc) {
File dataFolder = UserPreferences.getDataFolder(null);
if (dataFolder == null) {
new MaterialDialog.Builder(context)
@ -68,7 +77,7 @@ public class ChooseDataFolderDialog {
.items(choices)
.itemsCallbackSingleChoice(selectedIndex, (dialog1, itemView, which, text) -> {
String folder = folders.get(which);
handlerFunc.accept(folder);
handlerFunc.run(folder);
return true;
})
.negativeText(R.string.cancel_label)
@ -79,10 +88,10 @@ public class ChooseDataFolderDialog {
@SuppressWarnings("deprecation")
private static CharSequence fromHtmlVersioned(final String html) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
return Html.fromHtml(html);
}
return Html.fromHtml(html);
return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY);
}
}

12
app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
View File

@ -916,10 +916,14 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
}
private void showChooseDataFolderDialog() {
ChooseDataFolderDialog.showDialog(ui.getActivity(), (folder) -> {
UserPreferences.setDataFolder(folder);
setDataFolderText();
});
ChooseDataFolderDialog.showDialog(
ui.getActivity(), new ChooseDataFolderDialog.RunnableWithString() {
@Override
public void run(final String folder) {
UserPreferences.setDataFolder(folder);
setDataFolderText();
}
});
}
// UPDATE TIME/INTERVAL DIALOG