Refactor theme selection of dialogs

This makes sure the dark theme also uses dark dialogs.

7 files changed, 27 insertions, 27 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
index 4c1dbd1ee..b22053df1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DeleteKeyDialogActivity.java
@@ -49,6 +49,7 @@ import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
 import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
 import org.sufficientlysecure.keychain.ui.util.Notify;
+import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.Date;
@@ -254,8 +255,7 @@ public class DeleteKeyDialogActivity extends FragmentActivity {
             final long[] masterKeyIds = getArguments().getLongArray(ARG_DELETE_MASTER_KEY_IDS);
             final boolean hasSecret = getArguments().getBoolean(ARG_HAS_SECRET);
 
-            ContextThemeWrapper theme = new ContextThemeWrapper(activity,
-                    R.style.Theme_AppCompat_Light_Dialog);
+            ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);
 
             CustomAlertDialogBuilder builder = new CustomAlertDialogBuilder(theme);
 
@@ -351,10 +351,7 @@ public class DeleteKeyDialogActivity extends FragmentActivity {
             final String CHOICE_REVOKE = getString(R.string.del_rev_dialog_choice_rev_upload);
             final String CHOICE_DELETE = getString(R.string.del_rev_dialog_choice_delete);
 
-            // if the dialog is displayed from the application class, design is missing
-            // hack to get holo design (which is not automatically applied due to activity's Theme.NoDisplay
-            ContextThemeWrapper theme = new ContextThemeWrapper(activity,
-                    R.style.Theme_AppCompat_Light_Dialog);
+            ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);
 
             CustomAlertDialogBuilder builder = new CustomAlertDialogBuilder(theme);
             builder.setTitle(getString(R.string.del_rev_dialog_title,
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 8b482584d..d7224bd04 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -59,6 +59,7 @@ import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
 import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
+import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Passphrase;
 import org.sufficientlysecure.keychain.util.Preferences;
@@ -196,10 +197,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Activity activity = getActivity();
 
-            // if the dialog is displayed from the application class, design is missing
-            // hack to get holo design (which is not automatically applied due to activity's Theme.NoDisplay
-            ContextThemeWrapper theme = new ContextThemeWrapper(activity,
-                    R.style.Theme_AppCompat_Light_Dialog);
+            ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);
 
             mSubKeyId = getArguments().getLong(EXTRA_SUBKEY_ID);
             mServiceIntent = getArguments().getParcelable(EXTRA_SERVICE_INTENT);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java
index 85f2096db..2a00e8b70 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java
@@ -29,6 +29,7 @@ import android.support.v4.app.FragmentActivity;
 import android.view.ContextThemeWrapper;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
 import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
 
 public class RetryUploadDialogActivity extends FragmentActivity {
@@ -54,8 +55,7 @@ public class RetryUploadDialogActivity extends FragmentActivity {
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
 
-            ContextThemeWrapper theme = new ContextThemeWrapper(getActivity(),
-                    R.style.Theme_AppCompat_Light_Dialog);
+            ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(getActivity());
 
             CustomAlertDialogBuilder dialogBuilder = new CustomAlertDialogBuilder(theme);
             dialogBuilder.setTitle(R.string.retry_up_dialog_title);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java
index f88cf603a..d1d22b6d7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java
@@ -30,6 +30,7 @@ import android.view.ContextThemeWrapper;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.orbot.OrbotHelper;
 
@@ -67,11 +68,7 @@ public class OrbotStartDialogFragment extends DialogFragment {
         int middleButton = getArguments().getInt(ARG_MIDDLE_BUTTON);
         final Activity activity = getActivity();
 
-        // if the dialog is displayed from the application class, design is missing.
-        // hack to get holo design (which is not automatically applied due to activity's
-        // Theme.NoDisplay)
-        ContextThemeWrapper theme = new ContextThemeWrapper(activity,
-                R.style.Theme_AppCompat_Light_Dialog);
+        ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);
 
         CustomAlertDialogBuilder builder = new CustomAlertDialogBuilder(theme);
         builder.setTitle(title).setMessage(message);
@@ -126,4 +123,4 @@ public class OrbotStartDialogFragment extends DialogFragment {
 
         return builder.show();
     }
-}
\ No newline at end of file
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
index 52a90b323..764291dd0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
@@ -35,6 +35,7 @@ import android.widget.Button;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.service.KeychainService;
+import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
 
 /**
  * meant to be used
@@ -98,10 +99,7 @@ public class ProgressDialogFragment extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final Activity activity = getActivity();
 
-        // if the progress dialog is displayed from the application class, design is missing
-        // hack to get holo design (which is not automatically applied due to activity's Theme.NoDisplay
-        ContextThemeWrapper context = new ContextThemeWrapper(activity,
-                R.style.Theme_AppCompat_Light);
+        ContextThemeWrapper context = ThemeChanger.getDialogThemeWrapper(activity);
 
         ProgressDialog dialog = new ProgressDialog(context);
         dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/InstallDialogFragmentHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/InstallDialogFragmentHelper.java
index 5ddb013db..b2213ed10 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/InstallDialogFragmentHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/InstallDialogFragmentHelper.java
@@ -31,6 +31,7 @@ import android.view.ContextThemeWrapper;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
+import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
 import org.sufficientlysecure.keychain.util.Log;
 
 public class InstallDialogFragmentHelper {
@@ -65,11 +66,7 @@ public class InstallDialogFragmentHelper {
         final String installPath = args.getString(ARG_INSTALL_PATH);
         final boolean useMiddleButton = args.getBoolean(ARG_USE_MIDDLE_BUTTON);
 
-        // if the dialog is displayed from the application class, design is missing.
-        // hack to get holo design (which is not automatically applied due to activity's
-        // Theme.NoDisplay)
-        ContextThemeWrapper theme = new ContextThemeWrapper(activity,
-                R.style.Theme_AppCompat_Light_Dialog);
+        ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);
         CustomAlertDialogBuilder builder = new CustomAlertDialogBuilder(theme);
 
         builder.setTitle(title).setMessage(message);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java
index 4878271a2..f53e43528 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java
@@ -29,6 +29,19 @@ public class ThemeChanger {
     private Preferences mPreferences;
     private String mCurrentTheme = null;
 
+    static public ContextThemeWrapper getDialogThemeWrapper(Context context) {
+        Preferences preferences = Preferences.getPreferences(context);
+
+        // if the dialog is displayed from the application class, design is missing.
+        // hack to get holo design (which is not automatically applied due to activity's
+        // Theme.NoDisplay)
+        if (Constants.Pref.Theme.DARK.equals(preferences.getTheme())) {
+            return new ContextThemeWrapper(context, R.style.Theme_AppCompat_Dialog);
+        } else {
+            return new ContextThemeWrapper(context, R.style.Theme_AppCompat_Light_Dialog);
+        }
+    }
+
     public ThemeChanger(Context context) {
         mContext = context;
         mPreferences = Preferences.getPreferences(mContext);