From aa31abd93f568045d601df2507b228ec71e97926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 10 Jun 2015 19:47:29 +0200
Subject: Allow debug build besides release build

---
 OpenKeychain/src/main/AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 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 7b74a5b20..81a692e2e 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -50,9 +50,9 @@
         android:name="android.hardware.screen.portrait"
         android:required="false" />
 
-    <permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" />
+    <permission android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" />
 
-    <uses-permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" />
+    <uses-permission android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -727,7 +727,7 @@
 
         <provider
             android:name=".provider.KeychainProvider"
-            android:authorities="org.sufficientlysecure.keychain.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false" />
 
         <!-- Internal classes of the remote APIs (not exported) -->
@@ -805,9 +805,9 @@
         <!-- Storage Provider for temporary decrypted files -->
         <provider
             android:name=".provider.TemporaryStorageProvider"
-            android:authorities="org.sufficientlysecure.keychain.tempstorage"
+            android:authorities="${applicationId}.tempstorage"
             android:exported="true"
-            android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" />
+            android:writePermission="${applicationId}.WRITE_TEMPORARY_STORAGE" />
 
     </application>
 
-- 
cgit v1.2.3


From 260364e267ea4a5a227bf67a9867364578aecef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 10 Jun 2015 20:00:29 +0200
Subject: Use authority res strings

---
 OpenKeychain/src/main/AndroidManifest.xml | 7 ++-----
 1 file changed, 2 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 81a692e2e..ae39ee9ce 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -721,13 +721,10 @@
         <service
             android:name=".service.KeychainService"
             android:exported="false" />
-        <service
-            android:name=".service.CloudImportService"
-            android:exported="false" />
 
         <provider
             android:name=".provider.KeychainProvider"
-            android:authorities="${applicationId}.provider"
+            android:authorities="@string/provider_authority"
             android:exported="false" />
 
         <!-- Internal classes of the remote APIs (not exported) -->
@@ -805,7 +802,7 @@
         <!-- Storage Provider for temporary decrypted files -->
         <provider
             android:name=".provider.TemporaryStorageProvider"
-            android:authorities="${applicationId}.tempstorage"
+            android:authorities="@string/tempstorage_authority"
             android:exported="true"
             android:writePermission="${applicationId}.WRITE_TEMPORARY_STORAGE" />
 
-- 
cgit v1.2.3


From 05fcbcae7b816e72363030d499a43e0e6042b320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 10 Jun 2015 22:35:06 +0200
Subject: Temporary fix for testDebug

---
 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 ae39ee9ce..884aa6544 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -2,9 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.sufficientlysecure.keychain"
-    android:installLocation="auto"
-    android:versionCode="32300"
-    android:versionName="3.2.3">
+    android:installLocation="auto">
 
     <!--
         General remarks
@@ -724,7 +722,7 @@
 
         <provider
             android:name=".provider.KeychainProvider"
-            android:authorities="@string/provider_authority"
+            android:authorities="org.sufficientlysecure.keychain.provider"
             android:exported="false" />
 
         <!-- Internal classes of the remote APIs (not exported) -->
-- 
cgit v1.2.3


From 6749b03d9a7e0ab84934789adcb59d848ffb8b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 11 Jun 2015 00:31:41 +0200
Subject: Fix debug/release build separation

---
 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 884aa6544..89bdc49ac 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -722,7 +722,7 @@
 
         <provider
             android:name=".provider.KeychainProvider"
-            android:authorities="org.sufficientlysecure.keychain.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false" />
 
         <!-- Internal classes of the remote APIs (not exported) -->
@@ -800,7 +800,7 @@
         <!-- Storage Provider for temporary decrypted files -->
         <provider
             android:name=".provider.TemporaryStorageProvider"
-            android:authorities="@string/tempstorage_authority"
+            android:authorities="${applicationId}.tempstorage"
             android:exported="true"
             android:writePermission="${applicationId}.WRITE_TEMPORARY_STORAGE" />
 
-- 
cgit v1.2.3