Cleanup

3 files changed, 69 insertions, 75 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
index b88b58537..e037eb392 100644
--- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
@@ -16,84 +16,78 @@ import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.export.opml.OpmlElement;
 import de.danoeh.antennapod.core.export.opml.OpmlReader;
 
-public class OpmlImportWorker extends
-		AsyncTask<Void, Void, ArrayList<OpmlElement>> {
-	private static final String TAG = "OpmlImportWorker";
+public class OpmlImportWorker extends AsyncTask<Void, Void, ArrayList<OpmlElement>> {
+    private static final String TAG = "OpmlImportWorker";
 
-	private final Context context;
-	private Exception exception;
+    private final Context context;
+    private Exception exception;
+    private ProgressDialog progDialog;
 
-	private ProgressDialog progDialog;
-
-    private final Reader mReader;
+    private final Reader reader;
 
     public OpmlImportWorker(Context context, Reader reader) {
         super();
         this.context = context;
-        this.mReader=reader;
+        this.reader = reader;
     }
 
-	@Override
-	protected ArrayList<OpmlElement> doInBackground(Void... params) {
-		Log.d(TAG, "Starting background work");
+    @Override
+    protected ArrayList<OpmlElement> doInBackground(Void... params) {
+        Log.d(TAG, "Starting background work");
 
-        if (mReader==null) {
+        if (reader == null) {
             return null;
         }
 
-		OpmlReader opmlReader = new OpmlReader();
-		try {
-            ArrayList<OpmlElement> result = opmlReader.readDocument(mReader);
-			mReader.close();
-			return result;
-		} catch (XmlPullParserException e) {
-			e.printStackTrace();
-			exception = e;
-			return null;
-		} catch (IOException e) {
-			e.printStackTrace();
-			exception = e;
-			return null;
-		}
-
-	}
-
-	@Override
-	protected void onPostExecute(ArrayList<OpmlElement> result) {
-        if (mReader != null) {
+        OpmlReader opmlReader = new OpmlReader();
+        try {
+            ArrayList<OpmlElement> result = opmlReader.readDocument(reader);
+            reader.close();
+            return result;
+        } catch (XmlPullParserException e) {
+            e.printStackTrace();
+            exception = e;
+            return null;
+        } catch (IOException e) {
+            e.printStackTrace();
+            exception = e;
+            return null;
+        }
+
+    }
+
+    @Override
+    protected void onPostExecute(ArrayList<OpmlElement> result) {
+        if (reader != null) {
             try {
-                mReader.close();
+                reader.close();
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
-		progDialog.dismiss();
-		if (exception != null) {
-			Log.d(TAG, "An error occurred while trying to parse the opml document");
-			AlertDialog.Builder alert = new AlertDialog.Builder(context);
-			alert.setTitle(R.string.error_label);
-			alert.setMessage(context.getString(R.string.opml_reader_error)
-					+ exception.getMessage());
-			alert.setNeutralButton(android.R.string.ok, (dialog, which) -> dialog.dismiss());
-			alert.create().show();
-		}
-	}
-
-	@Override
-	protected void onPreExecute() {
-		progDialog = new ProgressDialog(context);
-		progDialog.setMessage(context.getString(R.string.reading_opml_label));
-		progDialog.setIndeterminate(true);
-		progDialog.setCancelable(false);
-		progDialog.show();
-	}
-	
-	public boolean wasSuccessful() {
-		return exception != null;
-	}
-	
-	public void executeAsync() {
-		executeOnExecutor(THREAD_POOL_EXECUTOR);
-	}
+        progDialog.dismiss();
+        if (exception != null) {
+            Log.d(TAG, "An error occurred while trying to parse the opml document");
+            AlertDialog.Builder alert = new AlertDialog.Builder(context);
+            alert.setTitle(R.string.error_label);
+            alert.setMessage(context.getString(R.string.opml_reader_error)
+                    + exception.getMessage());
+            alert.setNeutralButton(android.R.string.ok, (dialog, which) -> dialog.dismiss());
+            alert.create().show();
+        }
+    }
+
+    @Override
+    protected void onPreExecute() {
+        progDialog = new ProgressDialog(context);
+        progDialog.setMessage(context.getString(R.string.please_wait));
+        progDialog.setIndeterminate(true);
+        progDialog.setCancelable(false);
+        progDialog.show();
+    }
+
+    public void executeAsync() {
+        executeOnExecutor(THREAD_POOL_EXECUTOR);
+    }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java
index 9803e072c..f3d0acbe8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java
@@ -151,7 +151,7 @@ public class ImportExportPreferencesFragment extends PreferenceFragmentCompat {
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(() -> {
-                        Snackbar.make(getView(), R.string.export_ok, Snackbar.LENGTH_LONG).show();
+                        Snackbar.make(getView(), R.string.export_success_title, Snackbar.LENGTH_LONG).show();
                         progressDialog.dismiss();
                     }, this::showExportErrorDialog);
         }
@@ -242,7 +242,7 @@ public class ImportExportPreferencesFragment extends PreferenceFragmentCompat {
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(() -> {
-                        Snackbar.make(getView(), R.string.export_ok, Snackbar.LENGTH_LONG).show();
+                        Snackbar.make(getView(), R.string.export_success_title, Snackbar.LENGTH_LONG).show();
                         progressDialog.dismiss();
                     }, this::showExportErrorDialog);
         }
diff --git a/app/src/main/res/xml/preferences_import_export.xml b/app/src/main/res/xml/preferences_import_export.xml
index 7c576d194..12e27236d 100644
--- a/app/src/main/res/xml/preferences_import_export.xml
+++ b/app/src/main/res/xml/preferences_import_export.xml
@@ -3,17 +3,6 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch">
 
-    <PreferenceCategory android:title="@string/opml">
-        <Preference
-                android:key="prefOpmlExport"
-                android:title="@string/opml_export_label"
-                android:summary="@string/opml_export_summary"/>
-        <Preference
-                android:key="prefOpmlImport"
-                android:title="@string/opml_import_label"
-                android:summary="@string/opml_import_summary"/>
-    </PreferenceCategory>
-
     <PreferenceCategory android:title="@string/database">
         <Preference
                 android:key="prefDatabaseExport"
@@ -27,6 +16,17 @@
                 android:summary="@string/database_import_summary"/>
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/opml">
+        <Preference
+                android:key="prefOpmlExport"
+                android:title="@string/opml_export_label"
+                android:summary="@string/opml_export_summary"/>
+        <Preference
+                android:key="prefOpmlImport"
+                android:title="@string/opml_import_label"
+                android:summary="@string/opml_import_summary"/>
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/html">
         <Preference
                 android:key="prefHtmlExport"