From 7efeebc6381784a9362e5514fb50084c662dd335 Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Sun, 20 Mar 2016 11:52:36 +0100
Subject: #1661 - Don't expose CertifyActivity

*Add new activity - RedirectImportKeysActivity, which prompts user to
use Openkeychain directly
*Add intent filter for the activity
*Change intent filter for CertifyActivity
---
 OpenKeychain/src/main/AndroidManifest.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 50ab9aaae..8031606fb 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -711,6 +711,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.MainActivity" />
+        </activity>
+        <activity
+            android:name=".ui.RedirectImportKeysActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_activity_redirect_key">  >
+
             <!-- VIEW with fingerprint scheme:
                       Handle URIs with fingerprints when scanning directly from Barcode Scanner -->
             <intent-filter android:label="@string/intent_import_key">
@@ -726,11 +735,9 @@
                 <data android:scheme="OpenPGP4Fpr" />
                 <data android:scheme="OpenPGP4fpr" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.MainActivity" />
         </activity>
+
+
         <activity
             android:name=".ui.LogDisplayActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -943,4 +950,4 @@
 
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
-- 
cgit v1.2.3


From 298f89d36e5239f272709b6ec86e4b4b5d29b2a6 Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Thu, 24 Mar 2016 00:54:28 +0100
Subject: upgrade of Redirect import activity

-> RedirectImportActivity is transparent now
-> some poinlessly data removed
-> String moved into sources
-> xml for activity simplified
---
 OpenKeychain/src/main/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 8031606fb..f44e184a8 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -718,7 +718,8 @@
         <activity
             android:name=".ui.RedirectImportKeysActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_activity_redirect_key">  >
+            android:label="@string/title_activity_redirect_key"
+            android:theme="@android:style/Theme.Translucent">
 
             <!-- VIEW with fingerprint scheme:
                       Handle URIs with fingerprints when scanning directly from Barcode Scanner -->
-- 
cgit v1.2.3


From 05da8afad94ffa5f7c773e5bc0c6304b517e5419 Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Thu, 24 Mar 2016 19:45:59 +0100
Subject: Theme change

Theme.Keychain.Transparet is used
---
 OpenKeychain/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index f44e184a8..8fa5f52c4 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -719,7 +719,7 @@
             android:name=".ui.RedirectImportKeysActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_activity_redirect_key"
-            android:theme="@android:style/Theme.Translucent">
+            android:theme="@style/Theme.Keychain.Transparent">
 
             <!-- VIEW with fingerprint scheme:
                       Handle URIs with fingerprints when scanning directly from Barcode Scanner -->
-- 
cgit v1.2.3