1 files changed, 22 insertions, 29 deletions

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 47ff181b3..6febe57f4 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -358,29 +358,6 @@
             android:name="org.sufficientlysecure.keychain.service.KeychainIntentService"
             android:exported="false" />
 
-        <!-- TODO: Make this extended API -->
-
-
-        <!-- <meta-data -->
-        <!-- android:name="api_version" -->
-        <!-- android:value="3" /> -->
-        <!-- </service> -->
-        <!-- <service -->
-        <!-- android:name="org.sufficientlysecure.keychain.service.KeychainKeyService" -->
-        <!-- android:enabled="true" -->
-        <!-- android:exported="true" -->
-        <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_KEYS" -->
-        <!-- android:process=":remotekeys" > -->
-        <!-- <intent-filter> -->
-        <!-- <action android:name="org.sufficientlysecure.keychain.service.IKeychainKeyService" /> -->
-        <!-- </intent-filter> -->
-
-
-        <!-- <meta-data -->
-        <!-- android:name="api_version" -->
-        <!-- android:value="3" /> -->
-        <!-- </service> -->
-
         <provider
             android:name="org.sufficientlysecure.keychain.provider.KeychainProvider"
             android:authorities="org.sufficientlysecure.keychain.provider"
@@ -393,15 +370,15 @@
         <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> -->
 
 
-        <!-- OpenPGP API internal classes (not exported) -->
+        <!-- OpenPGP Remote API internal classes (not exported) -->
 
         <activity
-            android:name="org.sufficientlysecure.keychain.service.remote.OpenPgpServiceActivity"
+            android:name="org.sufficientlysecure.keychain.service.remote.RemoteServiceActivity"
             android:exported="false"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:process=":openpgp_api"
-            android:taskAffinity=":openpgp_api" />
+            android:process=":remote_api"
+            android:taskAffinity=":remote_api" />
         <activity
             android:name="org.sufficientlysecure.keychain.service.remote.RegisteredAppsListActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -412,13 +389,13 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:exported="false" />
 
-        <!-- OpenPGP API -->
+        <!-- OpenPGP Remote API -->
 
         <service
             android:name="org.sufficientlysecure.keychain.service.remote.OpenPgpService"
             android:enabled="true"
             android:exported="true"
-            android:process=":openpgp_api" >
+            android:process=":remote_api" >
             <intent-filter>
                 <action android:name="org.openintents.openpgp.IOpenPgpService" />
             </intent-filter>
@@ -427,6 +404,22 @@
                 android:name="api_version"
                 android:value="1" />
         </service>
+
+        <!-- Extended Remote API -->
+
+        <service
+            android:name="org.sufficientlysecure.keychain.service.remote.ExtendedApiService"
+            android:enabled="true"
+            android:exported="true"
+            android:process=":remote_api" >
+            <intent-filter>
+                <action android:name="org.sufficientlysecure.keychain.service.remote.IExtendedApiService" />
+            </intent-filter>
+
+            <meta-data
+                android:name="api_version"
+                android:value="1" />
+        </service>
     </application>
 
 </manifest>
\ No newline at end of file