Fix intent for api, fix slection dialog in demo

OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml

@@ -11,10 +11,10 @@
     <!-- android:key="aidl_demo2" -->
     <!-- android:title="AIDL Demo (ACCESS_KEYS permission)" /> -->
     <!-- </PreferenceCategory> -->
-    <PreferenceCategory android:title="Crypto Provider" >
+    <PreferenceCategory android:title="OpenPGP Provider" >
         <Preference
-            android:key="crypto_provider_demo"
+            android:key="openpgp_provider_demo"
-            android:title="Crypto Provider" />
+            android:title="OpenPGP Provider" />
     </PreferenceCategory>
 
 </PreferenceScreen>

OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java

@@ -50,7 +50,7 @@ public class BaseActivity extends PreferenceActivity {
         // find preferences
         mIntentDemo = (Preference) findPreference("intent_demo");
         mContentProviderDemo = (Preference) findPreference("content_provider_demo");
-        mCryptoProvider = (Preference) findPreference("crypto_provider_demo");
+        mCryptoProvider = (Preference) findPreference("openpgp_provider_demo");
         mAidlDemo = (Preference) findPreference("aidl_demo");
         mAidlDemo2 = (Preference) findPreference("aidl_demo2");
 

OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java

@@ -186,12 +186,12 @@ public class OpenPgpProviderActivity extends Activity {
         }
     }
 
-    private static class OpenPGPProviderElement {
+    private static class OpenPgpProviderElement {
         private String packageName;
         private String simpleName;
         private Drawable icon;
 
-        public OpenPGPProviderElement(String packageName, String simpleName, Drawable icon) {
+        public OpenPgpProviderElement(String packageName, String simpleName, Drawable icon) {
             this.packageName = packageName;
             this.simpleName = simpleName;
             this.icon = icon;
@@ -206,7 +206,7 @@ public class OpenPgpProviderActivity extends Activity {
     private void selectCryptoProvider() {
         Intent intent = new Intent(IOpenPgpService.class.getName());
 
-        final ArrayList<OpenPGPProviderElement> providerList = new ArrayList<OpenPGPProviderElement>();
+        final ArrayList<OpenPgpProviderElement> providerList = new ArrayList<OpenPgpProviderElement>();
 
         List<ResolveInfo> resInfo = getPackageManager().queryIntentServices(intent, 0);
         if (!resInfo.isEmpty()) {
@@ -218,7 +218,8 @@ public class OpenPgpProviderActivity extends Activity {
                 String simpleName = String.valueOf(resolveInfo.serviceInfo
                         .loadLabel(getPackageManager()));
                 Drawable icon = resolveInfo.serviceInfo.loadIcon(getPackageManager());
-                providerList.add(new OpenPGPProviderElement(packageName, simpleName, icon));
+                providerList.add(new OpenPgpProviderElement(packageName, simpleName, icon));
+            }
         }
 
         AlertDialog.Builder alert = new AlertDialog.Builder(this);
@@ -226,9 +227,12 @@ public class OpenPgpProviderActivity extends Activity {
         alert.setCancelable(false);
 
         if (!providerList.isEmpty()) {
+            // add "disable OpenPGP provider"
+            providerList.add(0, new OpenPgpProviderElement(null, "Disable OpenPGP Provider", getResources()
+                    .getDrawable(android.R.drawable.ic_menu_close_clear_cancel)));
 
-                // Init ArrayAdapter with Crypto Providers
+            // Init ArrayAdapter with OpenPGP Providers
-                ListAdapter adapter = new ArrayAdapter<OpenPGPProviderElement>(this,
+            ListAdapter adapter = new ArrayAdapter<OpenPgpProviderElement>(this,
                     android.R.layout.select_dialog_item, android.R.id.text1, providerList) {
                 public View getView(int position, View convertView, ViewGroup parent) {
                     // User super class to create the View
@@ -252,6 +256,11 @@ public class OpenPgpProviderActivity extends Activity {
                 public void onClick(DialogInterface dialog, int position) {
                     String packageName = providerList.get(position).packageName;
 
+                    if (packageName == null) {
+                        dialog.cancel();
+                        finish();
+                    }
+                    
                     // bind to service
                     mCryptoServiceConnection = new OpenPgpServiceConnection(
                             OpenPgpProviderActivity.this, packageName);
@@ -276,4 +285,3 @@ public class OpenPgpProviderActivity extends Activity {
         ad.show();
     }
 }
-}

OpenPGP-Keychain/AndroidManifest.xml

@@ -380,7 +380,7 @@
         <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> -->
 
 
-        <!-- OpenPGP Remote Service API internal -->
+        <!-- OpenPGP API internal classes (not exported) -->
 
         <activity
             android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpServiceActivity"
@@ -399,7 +399,7 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:exported="false" />
 
-        <!-- OpenPGP Remote Service API -->
+        <!-- OpenPGP API -->
 
         <service
             android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpService"
@@ -407,7 +407,7 @@
             android:exported="true"
             android:process=":openpgp_api" >
             <intent-filter>
-                <action android:name="org.openintents.crypto.ICryptoService" />
+                <action android:name="org.openintents.openpgp.IOpenPgpService" />
             </intent-filter>
 
             <meta-data