1 files changed, 12 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java
index 66b784f9b..fcf5dc11e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java
@@ -42,8 +42,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        mThemeChanger = new ThemeChanger(this);
-        mThemeChanger.changeTheme();
+        initTheme();
         super.onCreate(savedInstanceState);
         initLayout();
         initToolbar();
@@ -56,7 +55,9 @@ public abstract class BaseActivity extends AppCompatActivity {
         if (mThemeChanger.changeTheme()) {
             Intent intent = getIntent();
             finish();
+            overridePendingTransition(0, 0);
             startActivity(intent);
+            overridePendingTransition(0, 0);
         }
     }
 
@@ -73,6 +74,15 @@ public abstract class BaseActivity extends AppCompatActivity {
         mStatusBar = findViewById(R.id.status_bar);
     }
 
+    /**
+     * Override if you want a different theme!
+     */
+    protected void initTheme() {
+        mThemeChanger = new ThemeChanger(this);
+        mThemeChanger.setThemes(R.style.Theme_Keychain_Light, R.style.Theme_Keychain_Dark);
+        mThemeChanger.changeTheme();
+    }
+
     protected void setActionBarIcon(int iconRes) {
         mToolbar.setNavigationIcon(iconRes);
     }