Refactor theme selection of dialogs

This makes sure the dark theme also uses dark dialogs.

2 files changed, 5 insertions, 10 deletions

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);