From 53bc417f8f77a9f92786457281d02431ef614ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 15 Sep 2014 10:19:55 +0200
Subject: New decrypt activity design (WIP), saner UTF8 decoding (replacing
 non-decodable characters)

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

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

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 63ffc8acd..f684cdc6a 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -138,11 +138,6 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_select_recipients"
             android:launchMode="singleTop" />
-        <activity
-            android:name=".ui.SelectSecretKeyActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_select_secret_key"
-            android:launchMode="singleTop" />
         <activity
             android:name=".ui.EncryptFileActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -196,38 +191,22 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.DecryptOldActivity"
+            android:name=".ui.DecryptActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_decrypt"
+            android:windowSoftInputMode="stateHidden" />
+        <activity
+            android:name=".ui.DecryptTextActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_decrypt"
             android:windowSoftInputMode="stateHidden">
 
-            <!-- VIEW with mimeType application/octet-stream, application/pgp and text/pgp  -->
-            <intent-filter android:label="@string/intent_send_decrypt">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 -->
-                <data android:mimeType="application/octet-stream" />
-                <data android:mimeType="application/pgp" />
-                <data android:mimeType="text/pgp" />
-            </intent-filter>
             <!-- Keychain's own Actions -->
             <!-- DECRYPT with text as extra -->
             <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <!-- DECRYPT with data Uri -->
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" />
+                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_TEXT" />
 
                 <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="file" />
-                <data android:scheme="content" />
             </intent-filter>
             <!-- Android's Send Action -->
             <intent-filter android:label="@string/intent_send_decrypt">
@@ -235,129 +214,12 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:mimeType="*/*" />
-            </intent-filter>
-            <!-- Linking "Decrypt" to file types -->
-            <intent-filter android:label="@string/intent_decrypt_file">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:host="*" />
-                <data android:scheme="file" />
-                <data android:scheme="content" />
-
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
-                <data android:pathPattern=".*\\.asc" />
-                <data android:pathPattern=".*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <!-- GnuPG binary encrypted/signed data, binary format -->
-                <data android:pathPattern=".*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <!-- PGP encrypted data, binary format -->
-                <data android:pathPattern=".*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <!-- on some mail clients, PGP attachments show up as *.bin -->
-                <data android:pathPattern=".*\\.bin" />
-                <data android:pathPattern=".*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-            </intent-filter>
-            <!--
-                Some apps will only respect these file associations
-                if the mimeType is not set, and other apps will only respect them if mimeType is set
-                to */*. Therefore we have two whole copies of the same thing, besides setting the mimeType.
-            -->
-            <intent-filter android:label="@string/intent_decrypt_file">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:host="*" />
-                <data android:scheme="file" />
-                <data android:scheme="content" />
-
-                <data android:mimeType="*/*" />
-
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
-                <data android:pathPattern=".*\\.asc" />
-                <data android:pathPattern=".*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
-                <!-- GnuPG binary encrypted/signed data, binary format -->
-                <data android:pathPattern=".*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
-                <!-- PGP encrypted data, binary format -->
-                <data android:pathPattern=".*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pgp" />
-                <!-- on some mail clients, PGP attachments show up as *.bin -->
-                <data android:pathPattern=".*\\.bin" />
-                <data android:pathPattern=".*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" />
+                <data android:mimeType="text/*" />
+                <data android:mimeType="message/*" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.DecryptActivity"
+            android:name=".ui.DecryptFilesActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_decrypt"
             android:windowSoftInputMode="stateHidden">
@@ -375,12 +237,6 @@
                 <data android:mimeType="text/pgp" />
             </intent-filter>
             <!-- Keychain's own Actions -->
-            <!-- DECRYPT with text as extra -->
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
             <!-- DECRYPT with data Uri -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" />
@@ -396,7 +252,12 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:mimeType="*/*" />
+                <!-- everything except text/* and message/* -->
+                <data android:mimeType="image/*" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="application/*" />
+                <data android:mimeType="multipart/*" />
             </intent-filter>
             <!-- Linking "Decrypt" to file types -->
             <intent-filter android:label="@string/intent_decrypt_file">
-- 
cgit v1.2.3