Refactor theme selection of dialogs

This makes sure the dark theme also uses dark dialogs.

1 files changed, 13 insertions, 0 deletions

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