diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/src/main/AndroidManifest.xml | 8 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fb753b0c..11b539b81 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,6 +33,7 @@ android:label="@string/app_name" android:backupAgent=".core.backup.OpmlBackupAgent" android:restoreAnyVersion="true" + android:theme="@style/Theme.AntennaPod.Splash" android:usesCleartextTraffic="true" android:logo="@mipmap/ic_launcher"> @@ -53,12 +54,7 @@ <activity android:name=".activity.SplashActivity" android:label="@string/app_name" - android:configChanges="keyboardHidden|orientation|screenSize" - android:theme="@style/Theme.AntennaPod.Dark.Splash"> - <!-- android:launchMode="singleTask" removed for #2948, so that - when app is launched again, the app will go to the last activity users use - (if the app has been used recently, e.g., last 30 minutes), - rather than always go to MainActivity (launched by SplashActivity here) --> + android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> 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 9a09d55b0..8036a7506 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 @@ -216,8 +216,8 @@ public class ImportExportPreferencesFragment extends PreferenceFragmentCompat { private void showExportErrorDialog(final Throwable error) { progressDialog.dismiss(); - final AlertDialog.Builder alert = new AlertDialog.Builder(getContext()) - .setNeutralButton(android.R.string.ok, (dialog, which) -> dialog.dismiss()); + final AlertDialog.Builder alert = new AlertDialog.Builder(getContext()); + alert.setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss()); alert.setTitle(R.string.export_error_label); alert.setMessage(error.getMessage()); alert.show(); |