From d352ccf8aeb15b8858f95924c34dfbf0bb755a65 Mon Sep 17 00:00:00 2001
From: Durgesh <007durgesh219@gmail.com>
Date: Sat, 5 Mar 2016 17:27:22 +0530
Subject: Fix Dark theme no longer works in main screen on android 5,
 Issue#1746

Signed-off-by: Durgesh <007durgesh219@gmail.com>
---
 .../main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java')

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 107c63e0b..beaf68372 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
@@ -45,8 +45,8 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        initTheme();
         super.onCreate(savedInstanceState);
+        initTheme();
         initLayout();
         initToolbar();
     }
-- 
cgit v1.2.3


From a8603d69749f0609e07f8894c695ba500b8404cb Mon Sep 17 00:00:00 2001
From: Durgesh <007durgesh219@gmail.com>
Date: Mon, 7 Mar 2016 21:51:03 +0530
Subject: Fix CertifyKeyActivity back button on action bar not working #1758

Signed-off-by: Durgesh <007durgesh219@gmail.com>
---
 .../org/sufficientlysecure/keychain/ui/base/BaseActivity.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java')

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 beaf68372..063181dfe 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
@@ -26,6 +26,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -65,6 +66,16 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home :
+                onBackPressed();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     public static void onResumeChecks(Context context) {
         KeyserverSyncAdapterService.cancelUpdates(context);
         // in case user has disabled sync from Android account settings
-- 
cgit v1.2.3