lambdas break old Androids, sigh.

3 files changed, 31 insertions, 14 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
index e999091ad..d104a9e93 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
@@ -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) {
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ChooseDataFolderDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ChooseDataFolderDialog.java
index 339d9a8c2..e8faa7c29 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ChooseDataFolderDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ChooseDataFolderDialog.java
@@ -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);
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 3dbdf5961..6d749a289 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -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