From 7c275fed9d93e0c45b2fb00d94bde702b44c8811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 30 Apr 2015 18:45:43 +0200
Subject: API: Allow selection of decryption keys when decryption fails

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 8c66176fd..6bc61460a 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -740,6 +740,11 @@
             android:exported="false"
             android:label="@string/app_name"
             android:launchMode="singleTop" />
+        <activity
+            android:name=".remote.ui.SelectAllowedKeysActivity"
+            android:exported="false"
+            android:label="@string/app_name"
+            android:launchMode="singleTop" />
         <activity
             android:name=".remote.ui.AppSettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-- 
cgit v1.2.3


From e3f5c6d01e160dc638f15e912f4499065d17206f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 5 May 2015 09:26:57 +0200
Subject: Cleanup manifest

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 6bc61460a..6c3aabeef 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         Association of file types to Keychain
         =====================================
         General remarks about file ending conventions:
-        - *.gpg for binary files
+        - *.gpg,*.pgp for binary files
         - *.asc for ascii armored files The actual content can be anything.
         
         The file ending only shows if it is binary or ascii encoded.
@@ -148,8 +148,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- Keychain's own Actions -->
-            <!-- ENCRYPT with data Uri -->
+            <!-- ENCRYPT_DATA with data Uri -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_DATA" />
 
@@ -181,8 +180,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- Keychain's own Actions -->
-            <!-- ENCRYPT with text as extra -->
+            <!-- ENCRYPT_TEXT with text as extra -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_TEXT" />
 
@@ -208,8 +206,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- Keychain's own Actions -->
-            <!-- DECRYPT with text as extra -->
+            <!-- DECRYPT_TEXT with text as extra -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_TEXT" />
 
@@ -235,7 +232,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- VIEW with mimeType application/octet-stream, application/pgp and text/pgp  -->
+            <!-- VIEW with mimeTypes  -->
             <intent-filter android:label="@string/intent_send_decrypt">
                 <action android:name="android.intent.action.VIEW" />
 
@@ -255,9 +252,14 @@
                 <!-- non-standard MIME types found in the wild -->
                 <data android:mimeType="application/pgp" />
                 <data android:mimeType="text/pgp" />
+
+                <!--
+                  This links to attached asc files in AOSP mail. It is deactivated because of
+                  https://github.com/open-keychain/open-keychain/issues/290
+                -->
+                <!--<data android:mimeType="text/plain" />-->
             </intent-filter>
-            <!-- Keychain's own Actions -->
-            <!-- DECRYPT with data Uri -->
+            <!-- DECRYPT_DATA with data Uri -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_DATA" />
 
@@ -290,7 +292,7 @@
                 <data android:scheme="file" />
                 <data android:scheme="content" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -352,7 +354,7 @@
 
                 <data android:mimeType="*/*" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -516,7 +518,7 @@
                 <data android:scheme="file" />
                 <data android:scheme="content" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -578,7 +580,7 @@
 
                 <data android:mimeType="*/*" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -641,7 +643,6 @@
                 <data android:pathPattern="/pks/lookup.*"/>
             </intent-filter>
 
-            <!-- Keychain's own Actions -->
             <!-- IMPORT_KEY with files TODO: does this work? -->
             <intent-filter android:label="@string/intent_import_key">
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" />
-- 
cgit v1.2.3


From 63022aa96a4923dd800e8fab5009f3307290e707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 6 May 2015 14:32:17 +0200
Subject: Version 3.2

---
 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 6c3aabeef..aa3d46ec1 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.sufficientlysecure.keychain"
     android:installLocation="auto"
-    android:versionCode="31203"
-    android:versionName="3.2beta3">
+    android:versionCode="32000"
+    android:versionName="3.2">
 
     <!--
         General remarks
-- 
cgit v1.2.3


From 5b1bf888b4c69fd9bed0613917f01fcebf9c8529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 10 May 2015 11:15:10 +0200
Subject: Reformat manifest

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index aa3d46ec1..f979015ea 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -73,8 +73,8 @@
         android:allowBackup="false"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
-        android:theme="@style/KeychainTheme"
-        android:label="@string/app_name">
+        android:label="@string/app_name"
+        android:theme="@style/KeychainTheme">
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -88,11 +88,11 @@
         </activity>
         <activity
             android:name=".ui.CreateKeyActivity"
-            android:windowSoftInputMode="adjustResize"
+            android:allowTaskReparenting="true"
             android:label="@string/title_manage_my_keys"
             android:launchMode="singleTop"
-            android:allowTaskReparenting="true"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
@@ -132,8 +132,8 @@
             android:name=".ui.SafeSlingerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_exchange_keys"
-            android:windowSoftInputMode="stateHidden"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:windowSoftInputMode="stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
@@ -142,8 +142,8 @@
             android:name=".ui.EncryptFilesActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_encrypt_files"
-            android:windowSoftInputMode="stateHidden"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:windowSoftInputMode="stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
@@ -174,8 +174,8 @@
             android:name=".ui.EncryptTextActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_encrypt_text"
-            android:windowSoftInputMode="stateHidden"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:windowSoftInputMode="stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
@@ -200,8 +200,8 @@
             android:name=".ui.DecryptTextActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_decrypt"
-            android:windowSoftInputMode="stateHidden"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:windowSoftInputMode="stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
@@ -226,8 +226,8 @@
             android:name=".ui.DecryptFilesActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_decrypt"
-            android:windowSoftInputMode="stateHidden"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:windowSoftInputMode="stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
@@ -633,14 +633,14 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:scheme="https"/>
-                <data android:scheme="http"/>
+                <data android:scheme="https" />
+                <data android:scheme="http" />
                 <!-- if we don't specify a host, pathPattern will be ignored-->
-                <data android:host="*"/>
+                <data android:host="*" />
                 <!-- convention for keyserver paths specified by internet draft
                  draft-shaw-openpgp-hkp-00.txt
                  (http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00#section-3) -->
-                <data android:pathPattern="/pks/lookup.*"/>
+                <data android:pathPattern="/pks/lookup.*" />
             </intent-filter>
 
             <!-- IMPORT_KEY with files TODO: does this work? -->
@@ -690,9 +690,9 @@
          -->
         <activity
             android:name=".ui.NfcOperationActivity"
+            android:allowTaskReparenting="true"
             android:launchMode="singleTop"
-            android:taskAffinity=":Nfc"
-            android:allowTaskReparenting="true" />
+            android:taskAffinity=":Nfc" />
 
         <!--<activity-->
         <!--android:name=".ui.NfcIntentActivity"-->
@@ -806,8 +806,8 @@
         <provider
             android:name=".provider.TemporaryStorageProvider"
             android:authorities="org.sufficientlysecure.keychain.tempstorage"
-            android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE"
-            android:exported="true" />
+            android:exported="true"
+            android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" />
 
     </application>
 
-- 
cgit v1.2.3


From 5c44f8400970de5943fd6c5e804dfa394f3deb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 10 May 2015 13:16:37 +0200
Subject: 3.2.1

---
 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 f979015ea..332930dfb 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.sufficientlysecure.keychain"
     android:installLocation="auto"
-    android:versionCode="32000"
-    android:versionName="3.2">
+    android:versionCode="32100"
+    android:versionName="3.2.1">
 
     <!--
         General remarks
-- 
cgit v1.2.3