From 5faeb5f5f060e049000e804deca5445d281f8611 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 12 Jan 2015 13:17:18 +0100
Subject: intermediate state, nothing really working yet

---
 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 9fc79e6f1..b38a6137d 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -107,6 +107,10 @@
             android:name=".ui.EditKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_edit_key" />
+        <activity
+            android:name=".ui.affirmations.AffirmationWizard"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_affirmation" />
         <activity
             android:name=".ui.QrCodeViewActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-- 
cgit v1.2.3


From 92b8d874ed0d7e8f835dbd8ce4205e74841d7162 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 15 Jan 2015 16:59:11 +0100
Subject: affirmation -> linked identity

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index b38a6137d..ff04420d4 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -108,9 +108,9 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_edit_key" />
         <activity
-            android:name=".ui.affirmations.AffirmationWizard"
+            android:name=".ui.linked.LinkedIdWizard"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_affirmation" />
+            android:label="@string/title_linked_create" />
         <activity
             android:name=".ui.QrCodeViewActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-- 
cgit v1.2.3


From 2ef691b264fcc985dfd94708c185ea6715a1972d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 18 Aug 2015 11:19:50 +0200
Subject: Fix theme problems

---
 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 d422c3da1..dae34ff3a 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -701,7 +701,7 @@
          -->
         <activity
             android:name=".ui.NfcOperationActivity"
-            android:theme="@style/Theme.Keychain.Light.Dialog.SecurityToken"
+            android:theme="@style/Theme.Keychain.Light.Dialog"
             android:allowTaskReparenting="true"
             android:launchMode="singleTop"
             android:taskAffinity=":Nfc" />
-- 
cgit v1.2.3


From 1ef6f883e34a08dc916ad7dfabd7f892964aff54 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 27 Jul 2015 14:10:26 +0530
Subject: introduced keyserver sync adapter

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index dae34ff3a..d3047decc 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -800,6 +800,20 @@
                 android:resource="@xml/custom_pgp_contacts_structure" />
         </service>
 
+        <service
+            android:name=".service.KeyserverSyncAdapterService"
+            android:exported="true"
+            android:process=":sync"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/keyserver_sync_adapter_desc" />
+        </service>
+
         <!-- Storage Provider for temporary decrypted files -->
         <provider
             android:name=".provider.TemporaryStorageProvider"
-- 
cgit v1.2.3


From 6af24527da68721cb6e613e0bf8f8a5b4addbbf4 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Sun, 16 Aug 2015 14:32:35 +0530
Subject: changed sync name

---
 OpenKeychain/src/main/AndroidManifest.xml | 5 ++++-
 1 file changed, 4 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 d3047decc..0bc2e87ec 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -723,10 +723,13 @@
             android:name=".service.KeychainService"
             android:exported="false" />
 
+        <!-- label is made to be "Keyserver Sync" since that is the only context in which
+        the user will see it-->
         <provider
             android:name=".provider.KeychainProvider"
             android:authorities="${applicationId}.provider"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/keyserver_sync_settings_title"/>
 
         <!-- Internal classes of the remote APIs (not exported) -->
         <activity
-- 
cgit v1.2.3


From d3bda969539061e11aaa2dc4ea8eec84942b136b Mon Sep 17 00:00:00 2001
From: mgeier63 <mgeier63@gmail.com>
Date: Thu, 27 Aug 2015 09:12:21 +0200
Subject: service side support for
 https://github.com/open-keychain/openpgp-api/pull/3

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 0bc2e87ec..d57dae535 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -761,8 +761,9 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:exported="false" />
 
-        <!-- OpenPGP Remote API, this service has explicitly no permission requirements
-             because we are using our own package based allow/disallow system -->
+        <!-- DEPRECATED service,
+           using this service may lead to truncated data being returned to the caller
+         -->
         <service
             android:name=".remote.OpenPgpService"
             android:enabled="true"
@@ -774,6 +775,19 @@
             </intent-filter>
         </service>
 
+        <!-- OpenPGP Remote API, this service has explicitly no permission requirements
+             because we are using our own package based allow/disallow system -->
+        <service
+            android:name=".remote.OpenPgpService2"
+            android:enabled="true"
+            android:exported="true"
+            android:process=":remote_api_2"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="org.openintents.openpgp.IOpenPgpService2" />
+            </intent-filter>
+        </service>
+
         <!-- Contact Sync services -->
         <service
             android:name=".service.DummyAccountService"
-- 
cgit v1.2.3


From 7a98ffc90a34a381a68c5b485183373ed307320a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 12:34:54 +0200
Subject: Remove dead code

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 0bc2e87ec..f8708722a 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -691,7 +691,6 @@
         <activity
             android:name=".ui.OrbotRequiredDialogActivity"
             android:theme="@android:style/Theme.NoDisplay" />
-        <activity android:name=".ui.PassphraseWizardActivity" />
         <!--
         NOTE: singleTop is set to get NFC foreground dispatch to work.
               Then, all NFC intents will be broadcasted to onNewIntent() of this activity!
-- 
cgit v1.2.3


From b52a0303ca3a6b10661f36a0ff2102eb21dffaf7 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 1 Sep 2015 06:41:47 +0200
Subject: linked: redesign github resource creation, implement ouath flow (WIP)

---
 OpenKeychain/src/main/AndroidManifest.xml | 12 +++++++++++-
 1 file changed, 11 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 77d238239..cb886ed50 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -113,7 +113,17 @@
         <activity
             android:name=".ui.linked.LinkedIdWizard"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_linked_create" />
+            android:launchMode="singleInstance"
+            android:label="@string/title_linked_create">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:host="linked"
+                    android:scheme="oauth-openkeychain" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.QrCodeViewActivity"
             android:label="@string/share_qr_code_dialog_title" />
-- 
cgit v1.2.3


From 2cda48642722069c7e26d0a25d196e8a41128290 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 2 Sep 2015 04:13:32 +0200
Subject: linked: use webview instead of app, and some minor layoutings

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index cb886ed50..d2e953f8a 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -113,16 +113,7 @@
         <activity
             android:name=".ui.linked.LinkedIdWizard"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:launchMode="singleInstance"
             android:label="@string/title_linked_create">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data
-                    android:host="linked"
-                    android:scheme="oauth-openkeychain" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".ui.QrCodeViewActivity"
-- 
cgit v1.2.3


From dd850e5c72db1601aef54f9f35e1a2b11ae719c5 Mon Sep 17 00:00:00 2001
From: Kaladin Light <0.kaladin@gmail.com>
Date: Thu, 3 Sep 2015 13:25:09 -0400
Subject: Fixes open-keychain/open-keychain#1515 Move launcher icons to mipmap

---
 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 cb886ed50..02d1099b0 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -71,7 +71,7 @@
         android:name=".KeychainApplication"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.Keychain.Light">
         <activity
-- 
cgit v1.2.3


From 31cfbdc5d25f79ecda7c9c9290b8d80a4df5d89a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 6 Sep 2015 00:58:10 +0200
Subject: linked: fix "navigate up" in LinkedIdWizard (imperfect)

---
 OpenKeychain/src/main/AndroidManifest.xml | 4 +++-
 1 file changed, 3 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 d2e953f8a..1cd51d3c6 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -113,7 +113,9 @@
         <activity
             android:name=".ui.linked.LinkedIdWizard"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_linked_create">
+            android:label="@string/title_linked_create"
+            android:parentActivityName=".ui.ViewKeyActivity"
+            >
         </activity>
         <activity
             android:name=".ui.QrCodeViewActivity"
-- 
cgit v1.2.3