From aca54e31eae450e7deec54cca6654ee202c7a90f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 18 Mar 2015 18:25:44 +0100
Subject: generalize nfc crypto input structure

---
 OpenKeychain/src/main/AndroidManifest.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 91c84fb18..c5317ae24 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -680,6 +680,12 @@
             android:taskAffinity=":Nfc"
             android:allowTaskReparenting="true" />
 
+        <activity
+            android:name=".ui.NfcOperationActivity"
+            android:launchMode="singleTop"
+            android:taskAffinity=":Nfc"
+            android:allowTaskReparenting="true" />
+
         <!--<activity-->
         <!--android:name=".ui.NfcIntentActivity"-->
         <!--android:launchMode="singleTop">-->
-- 
cgit v1.2.3


From 1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 21 Mar 2015 19:52:10 +0100
Subject: work on ad-hoc yubikey import support

---
 OpenKeychain/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index d983498cc..fd999b0fb 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -90,6 +90,8 @@
             android:name=".ui.CreateKeyActivity"
             android:windowSoftInputMode="adjustResize"
             android:label="@string/title_manage_my_keys"
+            android:launchMode="singleTop"
+            android:allowTaskReparenting="true"
             android:parentActivityName=".ui.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-- 
cgit v1.2.3


From b0a51e7dd30b7f921d575e1e360670cbfed7be6c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 30 Mar 2015 23:39:36 +0200
Subject: remove unused NfcActivity

---
 OpenKeychain/src/main/AndroidManifest.xml | 6 ------
 1 file changed, 6 deletions(-)

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index b92d49d28..9b52bb788 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -670,12 +670,6 @@
               restarts the activity with onCreate() instead of calling onNewIntent().
               taskAffinity and allowTaskReparenting somehow prevents this from happening!
          -->
-        <activity
-            android:name=".ui.NfcActivity"
-            android:launchMode="singleTop"
-            android:taskAffinity=":Nfc"
-            android:allowTaskReparenting="true" />
-
         <activity
             android:name=".ui.NfcOperationActivity"
             android:launchMode="singleTop"
-- 
cgit v1.2.3


From 256d644d03f989132e9db01e15f75aaee2f76157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 13 Apr 2015 23:29:35 +0200
Subject: IMplement CryptoInputParcelCacheService

---
 OpenKeychain/src/main/AndroidManifest.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 9b52bb788..d0f50d5cc 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -696,6 +696,10 @@
             android:name=".service.PassphraseCacheService"
             android:exported="false"
             android:process=":passphrase_cache" />
+        <service
+            android:name=".remote.CryptoInputParcelCacheService"
+            android:exported="false"
+            android:process=":remote_api" />
         <service
             android:name=".service.KeychainIntentService"
             android:exported="false" />
-- 
cgit v1.2.3