Remove most of old API

OpenPGP-Keychain/AndroidManifest.xml

@@ -67,28 +67,6 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" />
 
-    <!-- TODO: disabled, old API -->
-    <!-- <permission-group -->
-    <!-- android:name="org.sufficientlysecure.keychain.permission-group.keychain" -->
-    <!-- android:description="@string/permission_group_description" -->
-    <!-- android:icon="@drawable/icon" -->
-    <!-- android:label="@string/permission_group_label" /> -->
-
-
-    <!-- <permission -->
-    <!-- android:name="org.sufficientlysecure.keychain.permission.ACCESS_KEYS" -->
-    <!-- android:description="@string/permission_access_keys_description" -->
-    <!-- android:label="@string/permission_access_keys_label" -->
-    <!-- android:permissionGroup="org.sufficientlysecure.keychain.permission-group.keychain" -->
-    <!-- android:protectionLevel="dangerous" /> -->
-    <!-- <permission -->
-    <!-- android:name="org.sufficientlysecure.keychain.permission.ACCESS_API" -->
-    <!-- android:description="@string/permission_access_api_description" -->
-    <!-- android:label="@string/permission_access_api_label" -->
-    <!-- android:permissionGroup="org.sufficientlysecure.keychain.permission-group.keychain" -->
-    <!-- android:protectionLevel="dangerous" /> -->
-
-
     <!-- android:allowBackup="false": Don't allow backup over adb backup or other apps! -->
     <application
         android:name=".KeychainApplication"
@@ -113,13 +91,15 @@
             android:label="@string/title_managePublicKeys"
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow" >
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
 
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_public_keys" />
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.SEARCH" /> -->
+            <!-- </intent-filter> -->
+
+
+            <!-- <meta-data -->
+            <!-- android:name="android.app.searchable" -->
+            <!-- android:resource="@xml/searchable_public_keys" /> -->
         </activity>
         <activity
             android:name=".ui.KeyListSecretActivity"
@@ -127,31 +107,22 @@
             android:label="@string/title_manageSecretKeys"
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow" >
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
 
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_secret_keys" />
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.SEARCH" /> -->
+            <!-- </intent-filter> -->
+
+
+            <!-- <meta-data -->
+            <!-- android:name="android.app.searchable" -->
+            <!-- android:resource="@xml/searchable_secret_keys" /> -->
         </activity>
-
-        <!-- todo: export disabled, old API -->
         <activity
             android:name=".ui.EditKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:exported="false"
             android:label="@string/title_editKey"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="stateHidden" >
-
-            <!-- TODO: disabled: old api! -->
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.EDIT_KEYRING" />
-                <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEYRING" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".ui.SelectPublicKeyActivity"
@@ -159,36 +130,30 @@
             android:label="@string/title_selectRecipients"
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow" >
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.SELECT_PUBLIC_KEYRINGS" />
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.SEARCH" /> -->
+            <!-- </intent-filter> -->
 
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_public_keys" />
+
+            <!-- <meta-data -->
+            <!-- android:name="android.app.searchable" -->
+            <!-- android:resource="@xml/searchable_public_keys" /> -->
         </activity>
         <activity
             android:name=".ui.SelectSecretKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_selectSignature"
             android:launchMode="singleTop" >
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.SELECT_SECRET_KEYRING" />
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.SEARCH" /> -->
+            <!-- </intent-filter> -->
 
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_secret_keys" />
+
+            <!-- <meta-data -->
+            <!-- android:name="android.app.searchable" -->
+            <!-- android:resource="@xml/searchable_secret_keys" /> -->
         </activity>
         <activity
             android:name=".ui.EncryptActivity"
@@ -197,16 +162,11 @@
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="stateHidden" >
 
-            <!-- APG's own Actions -->
+            <!-- Keychain's own Actions -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" />
                 <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_FILE" />
 
-                <!-- With permission ACCESS_API: -->
-                <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_AND_RETURN" />
-                <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_STREAM_AND_RETURN" />
-                <action android:name="org.sufficientlysecure.keychain.action.GENERATE_SIGNATURE_AND_RETURN" />
-
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="*/*" />
@@ -227,15 +187,11 @@
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="stateHidden" >
 
-            <!-- APG's own Actions -->
+            <!-- Keychain's own Actions -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" />
                 <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_FILE" />
 
-                <!-- With permission ACCESS_API: -->
-                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_AND_RETURN" />
-                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_STREAM_AND_RETURN" />
-
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="*/*" />
@@ -321,9 +277,9 @@
             android:label="@string/title_importKeys"
             android:uiOptions="splitActionBarWhenNarrow" >
 
-            <!-- APG's own Actions -->
+            <!-- Keychain's own Actions -->
             <intent-filter android:label="@string/intent_import_key" >
-                <action android:name="org.sufficientlysecure.keychain.action.IMPORT" />
+                <action android:name="org.sufficientlysecure.keychain.action.KEY_IMPORT" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -331,9 +287,8 @@
             </intent-filter>
             <!-- IMPORT again without mimeType to also allow data only without filename -->
             <intent-filter android:label="@string/intent_import_key" >
-                <action android:name="org.sufficientlysecure.keychain.action.IMPORT" />
-                <action android:name="org.sufficientlysecure.keychain.action.IMPORT_FROM_QR_CODE" />
-                <action android:name="org.sufficientlysecure.keychain.action.IMPORT_FROM_NFC" />
+                <action android:name="org.sufficientlysecure.keychain.action.KEY_IMPORT" />
+                <action android:name="org.sufficientlysecure.keychain.action.KEY_IMPORT_FROM_QR_CODE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -386,11 +341,6 @@
             android:label="@string/title_shareByNfc"
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow" >
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.SHARE_KEYRING_WITH_NFC" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
 
             <!-- Handle NFC tags detected from outside our application -->
             <intent-filter>
@@ -402,12 +352,6 @@
             </intent-filter>
         </activity>
         <activity android:name=".ui.ShareActivity" >
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.SHARE_KEYRING" />
-                <action android:name="org.sufficientlysecure.keychain.action.SHARE_KEYRING_WITH_QR_CODE" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".ui.HelpActivity"
@@ -419,16 +363,7 @@
             android:process=":passphrase_cache" />
         <service android:name="org.sufficientlysecure.keychain.service.KeychainIntentService" />
 
-        <!-- TODO: disabled, old API! -->
-        <!-- <service -->
-        <!-- android:name="org.sufficientlysecure.keychain.service.KeychainApiService" -->
-        <!-- android:enabled="true" -->
-        <!-- android:exported="true" -->
-        <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" -->
-        <!-- android:process=":remoteapi" > -->
-        <!-- <intent-filter> -->
-        <!-- <action android:name="org.sufficientlysecure.keychain.service.IKeychainApiService" /> -->
-        <!-- </intent-filter> -->
+        <!-- TODO: Make this extended API -->
 
 
         <!-- <meta-data -->
@@ -452,18 +387,11 @@
         <!-- </service> -->
 
         <provider
-            android:name="org.sufficientlysecure.keychain.provider.KeychainProviderInternal"
-            android:authorities="org.sufficientlysecure.keychain.internal"
+            android:name="org.sufficientlysecure.keychain.provider.KeychainProvider"
+            android:authorities="org.sufficientlysecure.keychain.provider"
             android:exported="false" />
-        <!-- TODO: disabled, old API -->
-        <!-- <provider -->
-        <!-- android:name="org.sufficientlysecure.keychain.provider.KeychainProviderExternal" -->
-        <!-- android:authorities="org.sufficientlysecure.keychain" -->
-        <!-- android:exported="true" -->
-        <!-- android:readPermission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> -->
 
-
-        <!-- TODO: authority! -->
+        <!-- TODO: authority! Make this API with content provider uris -->
         <!-- <provider -->
         <!-- android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider" -->
         <!-- android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider" -->
@@ -476,6 +404,7 @@
             android:name="org.sufficientlysecure.keychain.remote_api.CryptoServiceActivity"
             android:exported="false"
             android:label="@string/app_name"
+            android:launchMode="singleTop"
             android:process=":crypto" >
 
             <!-- Don't publish intents, they are only used internally! -->