From 75368034bd620d3d958ba6962f19e82edcb3a562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 15 Mar 2015 19:35:03 +0100
Subject: Put API activites in normal process to allow hydrate/dehydrate of
 logs

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 0e7baf039..cd4dc6940 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -710,14 +710,12 @@
             android:name=".remote.ui.RemoteServiceActivity"
             android:exported="false"
             android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:process=":remote_api" />
+            android:launchMode="singleTop" />
         <activity
             android:name=".remote.ui.SelectSignKeyIdActivity"
             android:exported="false"
             android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:process=":remote_api" />
+            android:launchMode="singleTop" />
         <activity
             android:name=".remote.ui.AppSettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-- 
cgit v1.2.3


From dbcb7a9e10ec4418337e0dce1b4227cbc3b7bd4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 17 Mar 2015 13:29:54 +0100
Subject: Manifest cleanup

---
 OpenKeychain/src/main/AndroidManifest.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index cd4dc6940..91c84fb18 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -414,7 +414,7 @@
         <activity
             android:name=".ui.ViewKeyAdvActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_advanced_key_info"/>
+            android:label="@string/title_advanced_key_info" />
         <activity
             android:name=".ui.SettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -656,6 +656,10 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
         </activity>
+        <activity
+            android:name=".ui.LogDisplayActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_log_display" />
         <activity
             android:name=".ui.ConsolidateDialogActivity"
             android:theme="@android:style/Theme.NoDisplay" />
@@ -743,13 +747,10 @@
             </intent-filter>
         </service>
 
-        <activity
-            android:name=".ui.LogDisplayActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_log_display"
-            android:exported="false" />
-
-        <service android:name=".service.DummyAccountService">
+        <!-- Contact Sync services -->
+        <service
+            android:name=".service.DummyAccountService"
+            tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
@@ -761,7 +762,8 @@
         <service
             android:name=".service.ContactSyncAdapterService"
             android:exported="true"
-            android:process=":sync">
+            android:process=":sync"
+            tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
@@ -774,6 +776,7 @@
                 android:resource="@xml/custom_pgp_contacts_structure" />
         </service>
 
+        <!-- Storage Provider for temporary decrypted files -->
         <provider
             android:name=".provider.TemporaryStorageProvider"
             android:authorities="org.sufficientlysecure.keychain.tempstorage"
-- 
cgit v1.2.3


From 98817d13ee2e33b92f3a339df312709be027e964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 19 Mar 2015 17:16:23 +0100
Subject: Manage my keys wizard

---
 OpenKeychain/src/main/AndroidManifest.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 91c84fb18..d9f9766c9 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -86,16 +86,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.FirstTimeActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
             android:name=".ui.CreateKeyActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:windowSoftInputMode="adjustResize"
-            android:label="@string/title_create_key"
+            android:label="@string/title_manage_my_keys"
             android:parentActivityName=".ui.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-- 
cgit v1.2.3