From 61451fa5b5dd197eede698ff8fe590cb46ced9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 28 May 2013 23:42:45 +0200
Subject: [PATCH 01/26] update API

---
 .../crypto/CryptoServiceConnection.java       | 16 +++++++++
 .../com/android/crypto/ICryptoService.aidl    | 34 +++++++++----------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
index 4d659d344..96a07a067 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
+++ b/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.android.crypto;
 
 import android.content.ComponentName;
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
index 05baa16e0..0f295d183 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
@@ -29,38 +29,36 @@ interface ICryptoService {
      * 
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @param encryptionKeyIds
-     *            Ids of public keys used for encryption
-     * @param handler
-     *            Results are returned to this Handler after successful encryption
+     * @param encryptionUserIds
+     *            User Ids (emails) of recipients
+     * @param callback
+     *            Callback where to return results
      */
     oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
     
     /**
      * Encrypt and sign
      *
-     * 
-     * 
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @param signatureKeyId
-     *            Key id of key to sign with
-     * @param handler
-     *            Results are returned to this Handler after successful encryption and signing
+     * @param encryptionUserIds
+     *            User Ids (emails) of recipients
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
      */
     oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, in ICryptoCallback callback);
     
     /**
      * Sign
      *
-     * 
-     * 
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @param signatureId
-     *            
-     * @param handler
-     *            Results are returned to this Handler after successful encryption and signing
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
      */
     oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
     
@@ -70,8 +68,8 @@ interface ICryptoService {
      * 
      * @param inputBytes
      *            Byte array you want to decrypt and verify
-     * @param handler
-     *            Handler where to return results to after successful encryption
+     * @param callback
+     *            Callback where to return results
      */
     oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);    
     

From 438ccd480e316582617e834a22d0f4c2815aa26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 29 May 2013 13:57:28 +0200
Subject: [PATCH 02/26] Check if passphrase is needed in
 PassphraseCacheService, extend documentation

---
 .../service/PassphraseCacheService.java       | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index d11b8e92a..6a4c8a0af 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -48,6 +48,12 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.util.Log;
 
+/**
+ * This service runs in its own process, but is available to all other processes as the main
+ * passphrase cache. Use the static methods addCachedPassphrase and getCachedPassphrase for
+ * convenience.
+ * 
+ */
 public class PassphraseCacheService extends Service {
     public static final String TAG = Constants.TAG + ": PassphraseCacheService";
 
@@ -74,9 +80,9 @@ public class PassphraseCacheService extends Service {
     Context mContext;
 
     /**
-     * This caches a new passphrase by sending a new command to the service. An android service is
-     * only run once. Thus, when the service is already started, new commands just add new events to
-     * the alarm manager for new passphrases to let them timeout in the future.
+     * This caches a new passphrase in memory by sending a new command to the service. An android
+     * service is only run once. Thus, when the service is already started, new commands just add
+     * new events to the alarm manager for new passphrases to let them timeout in the future.
      * 
      * @param context
      * @param keyId
@@ -95,21 +101,23 @@ public class PassphraseCacheService extends Service {
     }
 
     /**
-     * Gets a cached passphrase from memory, blocking method
+     * Gets a cached passphrase from memory by sending an intent to the service. This method is
+     * designed to wait until the service returns the passphrase.
      * 
      * @param context
      * @param keyId
-     * @return
+     * @return passphrase or null (if no passphrase is cached for this keyId)
      */
     public static String getCachedPassphrase(Context context, long keyId) {
         Log.d(TAG, "getCachedPassphrase() get masterKeyId for " + keyId);
+
         Intent intent = new Intent(context, PassphraseCacheService.class);
         intent.setAction(ACTION_PASSPHRASE_CACHE_GET);
 
         final Object mutex = new Object();
         final Bundle returnBundle = new Bundle();
 
-        HandlerThread handlerThread = new HandlerThread("getPassphrase");
+        HandlerThread handlerThread = new HandlerThread("getPassphraseThread");
         handlerThread.start();
         Handler returnHandler = new Handler(handlerThread.getLooper()) {
             @Override
@@ -121,6 +129,7 @@ public class PassphraseCacheService extends Service {
                 synchronized (mutex) {
                     mutex.notify();
                 }
+                // quit handlerThread
                 getLooper().quit();
             }
         };
@@ -147,6 +156,12 @@ public class PassphraseCacheService extends Service {
         }
     }
 
+    /**
+     * Internal implementation to get cached passphrase.
+     * 
+     * @param keyId
+     * @return
+     */
     private String getCachedPassphraseImpl(long keyId) {
         Log.d(TAG, "getCachedPassphraseImpl() get masterKeyId for " + keyId);
 
@@ -168,15 +183,15 @@ public class PassphraseCacheService extends Service {
         // get cached passphrase
         String cachedPassphrase = mPassphraseCache.get(masterKeyId);
         if (cachedPassphrase == null) {
-            // TODO: fix!
-            // check if secret key has a passphrase
-            // if (!hasPassphrase(context, masterKeyId)) {
-            // // cache empty passphrase
-            // addCachedPassphrase(context, masterKeyId, "");
-            // return "";
-            // } else {
-            return null;
-            // }
+            // if key has no passphrase -> cache and return empty passphrase
+            if (!hasPassphrase(this, masterKeyId)) {
+                Log.d(Constants.TAG, "Key has no passphrase! Caches and returns empty passphrase!");
+
+                addCachedPassphrase(this, masterKeyId, "");
+                return "";
+            } else {
+                return null;
+            }
         }
         // set it again to reset the cache life cycle
         Log.d(TAG, "Cache passphrase again when getting it!");
@@ -196,17 +211,10 @@ public class PassphraseCacheService extends Service {
         try {
             PGPSecretKey secretKey = PgpHelper.getMasterKey(ProviderHelper
                     .getPGPSecretKeyRingByKeyId(context, secretKeyId));
-
-            Log.d(Constants.TAG, "Check if key has no passphrase...");
             PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
                     "SC").build("".toCharArray());
             PGPPrivateKey testKey = secretKey.extractPrivateKey(keyDecryptor);
             if (testKey != null) {
-                Log.d(Constants.TAG, "Key has no passphrase! Caches empty passphrase!");
-
-                // cache empty passphrase
-                PassphraseCacheService.addCachedPassphrase(context, secretKey.getKeyID(), "");
-
                 return false;
             }
         } catch (PGPException e) {

From f6fc6caa1c112ae79ec2fc436a7db2f81a12c6bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 29 May 2013 15:58:50 +0200
Subject: [PATCH 03/26] rename to openintents namespace

---
 OpenPGP-Keychain/AndroidManifest.xml                 |  4 ++--
 .../openintents}/crypto/CryptoError.aidl             |  2 +-
 .../openintents}/crypto/CryptoError.java             |  2 +-
 .../openintents}/crypto/CryptoServiceConnection.java |  6 ++++--
 .../openintents}/crypto/CryptoSignatureResult.aidl   |  2 +-
 .../openintents}/crypto/CryptoSignatureResult.java   |  2 +-
 .../openintents}/crypto/ICryptoCallback.aidl         |  8 +++-----
 .../openintents}/crypto/ICryptoService.aidl          |  4 ++--
 .../keychain/crypto_provider/CryptoService.java      | 12 +++++++-----
 9 files changed, 22 insertions(+), 20 deletions(-)
 rename OpenPGP-Keychain/src/{com/android => org/openintents}/crypto/CryptoError.aidl (95%)
 rename OpenPGP-Keychain/src/{com/android => org/openintents}/crypto/CryptoError.java (98%)
 rename OpenPGP-Keychain/src/{com/android => org/openintents}/crypto/CryptoServiceConnection.java (94%)
 rename OpenPGP-Keychain/src/{com/android => org/openintents}/crypto/CryptoSignatureResult.aidl (96%)
 rename OpenPGP-Keychain/src/{com/android => org/openintents}/crypto/CryptoSignatureResult.java (98%)
 rename OpenPGP-Keychain/src/{com/android => org/openintents}/crypto/ICryptoCallback.aidl (83%)
 rename OpenPGP-Keychain/src/{com/android => org/openintents}/crypto/ICryptoService.aidl (96%)

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index d75350048..219cf2751 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -474,7 +474,7 @@
             android:label="TODO reg"
             android:process=":crypto" >
             <intent-filter>
-                <action android:name="com.android.crypto.REGISTER" />
+                <action android:name="org.openintents.crypto.REGISTER" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -486,7 +486,7 @@
             android:exported="true"
             android:process=":crypto" >
             <intent-filter>
-                <action android:name="com.android.crypto.ICryptoService" />
+                <action android:name="org.openintents.crypto.ICryptoService" />
             </intent-filter>
 
             <meta-data
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
similarity index 95%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
index d1b941212..7b67c8995 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package com.android.crypto;
+package org.openintents.crypto;
 
 // Declare CryptoError so AIDL can find it and knows that it implements the parcelable protocol.
 parcelable CryptoError;
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
similarity index 98%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoError.java
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
index 9540f4f68..265fe2633 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.java
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
similarity index 94%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
index 96a07a067..5df32dcf9 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
+
+import org.openintents.crypto.ICryptoService;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -66,7 +68,7 @@ public class CryptoServiceConnection {
                 Log.d(TAG, "not bound yet");
 
                 Intent serviceIntent = new Intent();
-                serviceIntent.setAction("com.android.crypto.ICryptoService");
+                serviceIntent.setAction("org.openintents.crypto.ICryptoService");
                 serviceIntent.setPackage(cryptoProviderPackageName); // TODO: test
                 mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
                         Context.BIND_AUTO_CREATE);
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
similarity index 96%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
index 21862c497..1d39bac70 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package com.android.crypto;
+package org.openintents.crypto;
 
 // Declare CryptoSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
 parcelable CryptoSignatureResult;
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
similarity index 98%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
index 87f5f43b5..e193b73b3 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
similarity index 83%
rename from OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
index af6587c04..80c741a9e 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
 
-import com.android.crypto.CryptoSignatureResult;
-import com.android.crypto.CryptoError;
+import org.openintents.crypto.CryptoSignatureResult;
+import org.openintents.crypto.CryptoError;
 
 interface ICryptoCallback {
 
@@ -27,6 +27,4 @@ interface ICryptoCallback {
 
 
     oneway void onError(in CryptoError error);
-    
-    oneway void onActivityRequired(in Intent intent);
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
similarity index 96%
rename from OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
index 0f295d183..04c8eb30e 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package com.android.crypto;
+package org.openintents.crypto;
 
-import com.android.crypto.ICryptoCallback;
+import org.openintents.crypto.ICryptoCallback;
 
 /**
  * All methods are oneway, which means they are asynchronous and non-blocking.
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index 1a57a457d..a367c613f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -20,6 +20,9 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+
+import org.openintents.crypto.CryptoError;
+import org.openintents.crypto.CryptoSignatureResult;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.helper.PgpMain;
@@ -29,10 +32,8 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 
-import com.android.crypto.CryptoError;
-import com.android.crypto.ICryptoCallback;
-import com.android.crypto.ICryptoService;
-import com.android.crypto.CryptoSignatureResult;
+import org.openintents.crypto.ICryptoCallback;
+import org.openintents.crypto.ICryptoService;
 
 import android.app.Service;
 import android.content.Context;
@@ -89,7 +90,8 @@ public class CryptoService extends Service {
                 // passphrase!
                 Intent intent = new Intent(CryptoActivity.ACTION_CACHE_PASSPHRASE);
                 intent.putExtra(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
-                callback.onActivityRequired(intent);
+                // TODO: start activity bind to service from activity send back intent on success
+//                callback.onActivityRequired(intent);
                 return;
             }
 

From 41338e115cb015c492dc44f224bc4b4cffe15cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 17 Jun 2013 15:52:09 +0200
Subject: [PATCH 04/26] Better API demo, open activity from service, discover
 crypto provider with packagemanager instead of register intent

---
 .../res/layout/crypto_provider_demo.xml       |  49 ++--
 .../org/openintents/crypto/CryptoError.aidl   |  20 ++
 .../org/openintents/crypto/CryptoError.java   |  76 +++++
 .../crypto/CryptoServiceConnection.java       |  91 ++++++
 .../crypto/CryptoSignatureResult.aidl         |  20 ++
 .../crypto/CryptoSignatureResult.java         |  76 +++++
 .../openintents/crypto/ICryptoCallback.aidl   |  30 ++
 .../openintents/crypto/ICryptoService.aidl    |  76 +++++
 .../demo/CryptoProviderDemoActivity.java      | 275 ++++++++----------
 OpenPGP-Keychain/AndroidManifest.xml          |  22 +-
 .../crypto/CryptoServiceConnection.java       |   2 +-
 .../crypto_provider/CryptoActivity.java       | 121 +++++++-
 .../crypto_provider/CryptoService.java        | 180 +++++++++---
 .../ICryptoServiceActivity.aidl               |  28 ++
 .../crypto_provider/RegisterActivity.java     |  74 -----
 .../util/PausableThreadPoolExecutor.java      |  89 ++++++
 16 files changed, 916 insertions(+), 313 deletions(-)
 create mode 100644 OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.aidl
 create mode 100644 OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.java
 create mode 100644 OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java
 create mode 100644 OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.aidl
 create mode 100644 OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.java
 create mode 100644 OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl
 create mode 100644 OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl
 delete mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/RegisterActivity.java
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java

diff --git a/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
index 447734a52..ecc2b4ac5 100644
--- a/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
+++ b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
@@ -15,58 +15,47 @@
             android:onClick="registerCryptoProvider"
             android:text="Register crypto provider" />
 
-        <Button
-            android:id="@+id/aidl_demo_select_secret_key"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="selectSecretKeyOnClick"
-            android:text="Select secret key" />
-
-        <Button
-            android:id="@+id/aidl_demo_select_encryption_key"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="selectEncryptionKeysOnClick"
-            android:text="Select encryption key(s)" />
-
         <EditText
-            android:id="@+id/aidl_demo_message"
+            android:id="@+id/crypto_provider_demo_message"
             android:layout_width="match_parent"
             android:layout_height="150dip"
             android:text="message"
             android:textAppearance="@android:style/TextAppearance.Small" />
 
         <EditText
-            android:id="@+id/aidl_demo_ciphertext"
+            android:id="@+id/crypto_provider_demo_ciphertext"
             android:layout_width="match_parent"
             android:layout_height="150dip"
-            android:text="ciphertext"
+            android:text="-----BEGIN PGP MESSAGE-----
+Charset: UTF-8
+Version: GnuPG v1.4.12 (GNU/Linux)
+Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
+
+hQEMAwCgOoTtKmfpAQgAlzmyQYCfkalCsAIxwtroHV9Bwz5LWY4GJNVrFBVddSFJ
+VkVxx/UDqtIS+TvL8RBG3Er3xFilTV+iBSDjSGIXHkSv6Z7Od69nKcQpJLNaCpDj
+/Ag7PsINLUzAvUdPto3ZMCwShe/uoD4e4Gr5BG8na/9W77tegufS2gUUlc5BAOZP
+GUlSPySJP2bpI/3U/R86Z2ByzFKeJIEKWBtBvMPmIgA5VPo0+mamTedRhOIrJM/R
+vUMM2HfLjAxcX9lYEw4aQGROOu1xpN9FPojQOO10imibZb+TEcxtSHwpj2vll1BP
+pXvtuR0E9OGVmRI9aBXiRTB2P9SJ6UPpR13m8FaLVtJPAa2xH4wA5Yr6uZ5x7LjO
+BtO8VErKgoUpO57BgU1ZsVFEcrGiobkreXabKIB+qC0qMJ6maoLlnOPi1IAvhU42
+z/7HBqqhcNiHc5JMs9+wmw==
+=00nh
+-----END PGP MESSAGE-----"
             android:textAppearance="@android:style/TextAppearance.Small" />
 
         <Button
-            android:id="@+id/aidl_demo_encrypt"
+            android:id="@+id/crypto_provider_demo_encrypt"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:onClick="encryptOnClick"
             android:text="Encrypt" />
 
         <Button
-            android:id="@+id/aidl_demo_decrypt"
+            android:id="@+id/crypto_provider_demo_decrypt"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:onClick="decryptOnClick"
             android:text="Decrypt" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="APG Data:" />
-
-        <TextView
-            android:id="@+id/aidl_demo_data"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:minLines="10" />
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.aidl
new file mode 100644
index 000000000..7b67c8995
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.aidl
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+package org.openintents.crypto;
+
+// Declare CryptoError so AIDL can find it and knows that it implements the parcelable protocol.
+parcelable CryptoError;
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.java
new file mode 100644
index 000000000..265fe2633
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoError.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.crypto;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class CryptoError implements Parcelable {
+    int errorId;
+    String message;
+
+    public CryptoError() {
+    }
+
+    public CryptoError(int errorId, String message) {
+        this.errorId = errorId;
+        this.message = message;
+    }
+
+    public CryptoError(CryptoError b) {
+        this.errorId = b.errorId;
+        this.message = b.message;
+    }
+
+    public int getErrorId() {
+        return errorId;
+    }
+
+    public void setErrorId(int errorId) {
+        this.errorId = errorId;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(errorId);
+        dest.writeString(message);
+    }
+
+    public static final Creator<CryptoError> CREATOR = new Creator<CryptoError>() {
+        public CryptoError createFromParcel(final Parcel source) {
+            CryptoError error = new CryptoError();
+            error.errorId = source.readInt();
+            error.message = source.readString();
+            return error;
+        }
+
+        public CryptoError[] newArray(final int size) {
+            return new CryptoError[size];
+        }
+    };
+}
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java
new file mode 100644
index 000000000..5df32dcf9
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.crypto;
+
+import org.openintents.crypto.ICryptoService;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.util.Log;
+
+public class CryptoServiceConnection {
+    private Context mApplicationContext;
+
+    private ICryptoService mService;
+    private boolean bound;
+    private String cryptoProviderPackageName;
+
+    private static final String TAG = "CryptoConnection";
+
+    public CryptoServiceConnection(Context context, String cryptoProviderPackageName) {
+        mApplicationContext = context.getApplicationContext();
+        this.cryptoProviderPackageName = cryptoProviderPackageName;
+    }
+
+    public ICryptoService getService() {
+        return mService;
+    }
+
+    private ServiceConnection mCryptoServiceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = ICryptoService.Stub.asInterface(service);
+            Log.d(TAG, "connected to service");
+            bound = true;
+        }
+
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+            Log.d(TAG, "disconnected from service");
+            bound = false;
+        }
+    };
+
+    /**
+     * If not already bound, bind!
+     * 
+     * @return
+     */
+    public boolean bindToService() {
+        if (mService == null && !bound) { // if not already connected
+            try {
+                Log.d(TAG, "not bound yet");
+
+                Intent serviceIntent = new Intent();
+                serviceIntent.setAction("org.openintents.crypto.ICryptoService");
+                serviceIntent.setPackage(cryptoProviderPackageName); // TODO: test
+                mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
+                        Context.BIND_AUTO_CREATE);
+
+                return true;
+            } catch (Exception e) {
+                Log.d(TAG, "Exception", e);
+                return false;
+            }
+        } else { // already connected
+            Log.d(TAG, "already bound... ");
+            return true;
+        }
+    }
+
+    public void unbindFromService() {
+        mApplicationContext.unbindService(mCryptoServiceConnection);
+    }
+
+}
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.aidl
new file mode 100644
index 000000000..1d39bac70
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.aidl
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+package org.openintents.crypto;
+
+// Declare CryptoSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
+parcelable CryptoSignatureResult;
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.java
new file mode 100644
index 000000000..e193b73b3
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoSignatureResult.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.crypto;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class CryptoSignatureResult implements Parcelable {
+    String signatureUserId;
+
+    boolean signature;
+    boolean signatureSuccess;
+    boolean signatureUnknown;
+
+    public CryptoSignatureResult() {
+
+    }
+
+    public CryptoSignatureResult(String signatureUserId, boolean signature,
+            boolean signatureSuccess, boolean signatureUnknown) {
+        this.signatureUserId = signatureUserId;
+
+        this.signature = signature;
+        this.signatureSuccess = signatureSuccess;
+        this.signatureUnknown = signatureUnknown;
+    }
+
+    public CryptoSignatureResult(CryptoSignatureResult b) {
+        this.signatureUserId = b.signatureUserId;
+
+        this.signature = b.signature;
+        this.signatureSuccess = b.signatureSuccess;
+        this.signatureUnknown = b.signatureUnknown;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(signatureUserId);
+
+        dest.writeByte((byte) (signature ? 1 : 0));
+        dest.writeByte((byte) (signatureSuccess ? 1 : 0));
+        dest.writeByte((byte) (signatureUnknown ? 1 : 0));
+    }
+
+    public static final Creator<CryptoSignatureResult> CREATOR = new Creator<CryptoSignatureResult>() {
+        public CryptoSignatureResult createFromParcel(final Parcel source) {
+            CryptoSignatureResult vr = new CryptoSignatureResult();
+            vr.signatureUserId = source.readString();
+            vr.signature = source.readByte() == 1;
+            vr.signatureSuccess = source.readByte() == 1;
+            vr.signatureUnknown = source.readByte() == 1;
+            return vr;
+        }
+
+        public CryptoSignatureResult[] newArray(final int size) {
+            return new CryptoSignatureResult[size];
+        }
+    };
+}
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl
new file mode 100644
index 000000000..80c741a9e
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.crypto;
+
+import org.openintents.crypto.CryptoSignatureResult;
+import org.openintents.crypto.CryptoError;
+
+interface ICryptoCallback {
+
+    oneway void onEncryptSignSuccess(in byte[] outputBytes);
+    
+    oneway void onDecryptVerifySuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult);
+
+
+    oneway void onError(in CryptoError error);
+}
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
new file mode 100644
index 000000000..04c8eb30e
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+package org.openintents.crypto;
+
+import org.openintents.crypto.ICryptoCallback;
+
+/**
+ * All methods are oneway, which means they are asynchronous and non-blocking.
+ * Results are returned to the callback, which has to be implemented on client side.
+ */
+interface ICryptoService {
+       
+    /**
+     * Encrypt
+     * 
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param encryptionUserIds
+     *            User Ids (emails) of recipients
+     * @param callback
+     *            Callback where to return results
+     */
+    oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
+    
+    /**
+     * Encrypt and sign
+     *
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param encryptionUserIds
+     *            User Ids (emails) of recipients
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
+     */
+    oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, in ICryptoCallback callback);
+    
+    /**
+     * Sign
+     *
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
+     */
+    oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
+    
+    /**
+     * Decrypts and verifies given input bytes. If no signature is present this method
+     * will only decrypt.
+     * 
+     * @param inputBytes
+     *            Byte array you want to decrypt and verify
+     * @param callback
+     *            Callback where to return results
+     */
+    oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);    
+    
+}
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
index b915e2a76..03668fcab 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,30 +16,30 @@
 
 package org.sufficientlysecure.keychain.demo;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openintents.crypto.CryptoError;
+import org.openintents.crypto.CryptoServiceConnection;
+import org.openintents.crypto.CryptoSignatureResult;
+import org.openintents.crypto.ICryptoCallback;
 import org.sufficientlysecure.keychain.demo.R;
 import org.sufficientlysecure.keychain.integration.Constants;
-import org.sufficientlysecure.keychain.integration.KeychainData;
-import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
-import org.sufficientlysecure.keychain.service.IKeychainApiService;
-import org.sufficientlysecure.keychain.service.IKeychainKeyService;
-import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler;
-import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler;
-import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
-import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.ServiceConnection;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
 import android.widget.TextView;
-import android.widget.Toast;
 
 public class CryptoProviderDemoActivity extends Activity {
     Activity mActivity;
@@ -48,19 +48,9 @@ public class CryptoProviderDemoActivity extends Activity {
     TextView mCiphertextTextView;
     TextView mDataTextView;
 
-    KeychainIntentHelper mKeychainIntentHelper;
-    KeychainData mKeychainData;
+    private CryptoServiceConnection mCryptoServiceConnection;
 
-    private IKeychainApiService service = null;
-    private ServiceConnection svcConn = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder binder) {
-            service = IKeychainApiService.Stub.asInterface(binder);
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            service = null;
-        }
-    };
+    private static final String CRYPTO_SERVICE_INTENT = "org.openintents.crypto.ICryptoService";
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -69,55 +59,49 @@ public class CryptoProviderDemoActivity extends Activity {
 
         mActivity = this;
 
-        mMessageTextView = (TextView) findViewById(R.id.aidl_demo_message);
-        mCiphertextTextView = (TextView) findViewById(R.id.aidl_demo_ciphertext);
+        mMessageTextView = (TextView) findViewById(R.id.crypto_provider_demo_message);
+        mCiphertextTextView = (TextView) findViewById(R.id.crypto_provider_demo_ciphertext);
         mDataTextView = (TextView) findViewById(R.id.aidl_demo_data);
 
-        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
-        mKeychainData = new KeychainData();
-
-        bindService(new Intent(IKeychainApiService.class.getName()), svcConn,
-                Context.BIND_AUTO_CREATE);
+        selectCryptoProvider();
     }
 
-    public void registerCryptoProvider(View view) {
-        try {
-            startActivityForResult(Intent.createChooser(new Intent("com.android.crypto.REGISTER"),
-                    "select crypto provider"), 123);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(mActivity, "No app that handles com.android.crypto.REGISTER!",
-                    Toast.LENGTH_LONG).show();
-            Log.e(Constants.TAG, "No app that handles com.android.crypto.REGISTER!");
-        }
-    }
+    /**
+     * Callback from remote crypto service
+     */
+    final ICryptoCallback.Stub callback = new ICryptoCallback.Stub() {
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == 123) {
-            if (resultCode == RESULT_OK) {
-                String packageName = data.getStringExtra("packageName");
-                Log.d(Constants.TAG, "packageName: " + packageName);
-            }
+        @Override
+        public void onEncryptSignSuccess(byte[] outputBytes) throws RemoteException {
+            // not needed here
         }
 
-        // boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
-        // mKeychainData);
-        // if (result) {
-        // updateView();
-        // }
+        @Override
+        public void onDecryptVerifySuccess(byte[] outputBytes, CryptoSignatureResult signatureResult)
+                throws RemoteException {
+            Log.d(Constants.TAG, "onDecryptVerifySuccess");
 
-        // continue with other activity results
-        super.onActivityResult(requestCode, resultCode, data);
-    }
+            // PgpData data = new PgpData();
+            // data.setDecryptedData(new String(outputBytes));
+            // mFragment.setMessageWithPgpData(data);
+        }
+
+        @Override
+        public void onError(CryptoError error) throws RemoteException {
+            Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId());
+            Log.e(Constants.TAG, "onError getErrorId:" + error.getMessage());
+        }
+
+    };
 
     public void encryptOnClick(View view) {
         byte[] inputBytes = mMessageTextView.getText().toString().getBytes();
 
         try {
-            service.encryptAsymmetric(inputBytes, null, true, 0, mKeychainData.getPublicKeys(), 7,
-                    encryptHandler);
+            mCryptoServiceConnection.getService().encrypt(inputBytes,
+                    new String[] { "dominik@dominikschuermann.de" }, callback);
         } catch (RemoteException e) {
-            exceptionImplementation(-1, e.toString());
+            Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
     }
 
@@ -125,114 +109,109 @@ public class CryptoProviderDemoActivity extends Activity {
         byte[] inputBytes = mCiphertextTextView.getText().toString().getBytes();
 
         try {
-            service.decryptAndVerifyAsymmetric(inputBytes, null, null, decryptHandler);
+            mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, callback);
         } catch (RemoteException e) {
-            exceptionImplementation(-1, e.toString());
+            Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
     }
 
-    private void updateView() {
-        if (mKeychainData.getDecryptedData() != null) {
-            mMessageTextView.setText(mKeychainData.getDecryptedData());
-        }
-        if (mKeychainData.getEncryptedData() != null) {
-            mCiphertextTextView.setText(mKeychainData.getEncryptedData());
-        }
-        mDataTextView.setText(mKeychainData.toString());
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
 
-        unbindService(svcConn);
+        if (mCryptoServiceConnection != null) {
+            mCryptoServiceConnection.unbindFromService();
+        }
     }
 
-    private void exceptionImplementation(int exceptionId, String error) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
+    private static class CryptoProviderElement {
+        private String packageName;
+        private String simpleName;
+        private Drawable icon;
+
+        public CryptoProviderElement(String packageName, String simpleName, Drawable icon) {
+            this.packageName = packageName;
+            this.simpleName = simpleName;
+            this.icon = icon;
+        }
+
+        @Override
+        public String toString() {
+            return simpleName;
+        }
     }
 
-    private final IKeychainEncryptHandler.Stub encryptHandler = new IKeychainEncryptHandler.Stub() {
+    private void selectCryptoProvider() {
+        Intent intent = new Intent(CRYPTO_SERVICE_INTENT);
 
-        @Override
-        public void onException(final int exceptionId, final String message) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    exceptionImplementation(exceptionId, message);
-                }
-            });
-        }
+        final ArrayList<CryptoProviderElement> providerList = new ArrayList<CryptoProviderElement>();
 
-        @Override
-        public void onSuccess(final byte[] outputBytes, String outputUri) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    mKeychainData.setEncryptedData(new String(outputBytes));
-                    updateView();
-                }
-            });
-        }
+        List<ResolveInfo> resInfo = getPackageManager().queryIntentServices(intent, 0);
+        if (!resInfo.isEmpty()) {
+            for (ResolveInfo resolveInfo : resInfo) {
+                if (resolveInfo.serviceInfo == null)
+                    continue;
 
-    };
+                String packageName = resolveInfo.serviceInfo.packageName;
+                String simpleName = String.valueOf(resolveInfo.serviceInfo
+                        .loadLabel(getPackageManager()));
+                Drawable icon = resolveInfo.serviceInfo.loadIcon(getPackageManager());
+                providerList.add(new CryptoProviderElement(packageName, simpleName, icon));
+            }
 
-    private final IKeychainDecryptHandler.Stub decryptHandler = new IKeychainDecryptHandler.Stub() {
+            AlertDialog.Builder alert = new AlertDialog.Builder(this);
+            alert.setTitle("Select Crypto Provider!");
+            alert.setCancelable(false);
 
-        @Override
-        public void onException(final int exceptionId, final String message) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    exceptionImplementation(exceptionId, message);
-                }
-            });
-        }
+            if (!providerList.isEmpty()) {
 
-        @Override
-        public void onSuccess(final byte[] outputBytes, String outputUri, boolean signature,
-                long signatureKeyId, String signatureUserId, boolean signatureSuccess,
-                boolean signatureUnknown) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    mKeychainData.setDecryptedData(new String(outputBytes));
-                    updateView();
+                // Init ArrayAdapter with Crypto Providers
+                ListAdapter adapter = new ArrayAdapter<CryptoProviderElement>(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
+                        View v = super.getView(position, convertView, parent);
+                        TextView tv = (TextView) v.findViewById(android.R.id.text1);
+
+                        // Put the image on the TextView
+                        tv.setCompoundDrawablesWithIntrinsicBounds(providerList.get(position).icon,
+                                null, null, null);
+
+                        // Add margin between image and text (support various screen densities)
+                        int dp5 = (int) (5 * getResources().getDisplayMetrics().density + 0.5f);
+                        tv.setCompoundDrawablePadding(dp5);
+
+                        return v;
+                    }
+                };
+
+                alert.setSingleChoiceItems(adapter, -1, new DialogInterface.OnClickListener() {
+
+                    public void onClick(DialogInterface dialog, int position) {
+                        String packageName = providerList.get(position).packageName;
+
+                        // bind to service
+                        mCryptoServiceConnection = new CryptoServiceConnection(
+                                CryptoProviderDemoActivity.this, packageName);
+                        mCryptoServiceConnection.bindToService();
+
+                        dialog.dismiss();
+                    }
+                });
+            } else {
+                alert.setMessage("No Crypto Provider installed!");
+            }
+
+            alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+
+                public void onClick(DialogInterface dialog, int id) {
+                    dialog.cancel();
+                    finish();
                 }
             });
 
+            AlertDialog ad = alert.create();
+            ad.show();
         }
-
-    };
-
-    private final IKeychainGetDecryptionKeyIdHandler.Stub helperHandler = new IKeychainGetDecryptionKeyIdHandler.Stub() {
-
-        @Override
-        public void onException(final int exceptionId, final String message) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    exceptionImplementation(exceptionId, message);
-                }
-            });
-        }
-
-        @Override
-        public void onSuccess(long arg0, boolean arg1) throws RemoteException {
-            // TODO Auto-generated method stub
-
-        }
-
-    };
-
-    /**
-     * Selection is done with Intents, not AIDL!
-     * 
-     * @param view
-     */
-    public void selectSecretKeyOnClick(View view) {
-        mKeychainIntentHelper.selectSecretKey();
     }
-
-    public void selectEncryptionKeysOnClick(View view) {
-        mKeychainIntentHelper.selectPublicKeys("user@example.com");
-
-    }
-
 }
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 219cf2751..0b8ed515e 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -456,29 +456,18 @@
             android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider"
             android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
 
-        <!-- Crypto Provider other intents -->
+        <!-- Crypto Provider internal intents -->
+
         <activity
             android:name=".crypto_provider.CryptoActivity"
+            android:exported="false"
             android:label="TODO crypto activity"
             android:process=":crypto" >
-            <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.CRYPTO_CACHE_PASSPHRASE" />
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+            <!-- Don't publish intents, they are only used internally! -->
         </activity>
 
         <!-- Crypto Provider API -->
-        <activity
-            android:name=".crypto_provider.RegisterActivity"
-            android:label="TODO reg"
-            android:process=":crypto" >
-            <intent-filter>
-                <action android:name="org.openintents.crypto.REGISTER" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
 
         <service
             android:name="org.sufficientlysecure.keychain.crypto_provider.CryptoService"
@@ -487,6 +476,9 @@
             android:process=":crypto" >
             <intent-filter>
                 <action android:name="org.openintents.crypto.ICryptoService" />
+
+                <!-- Can only be used from OpenPGP Keychain (internal): -->
+                <action android:name="org.sufficientlysecure.keychain.crypto_provider.ICryptoServiceActivity" />
             </intent-filter>
 
             <meta-data
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
index 5df32dcf9..d9e91f772 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
@@ -69,7 +69,7 @@ public class CryptoServiceConnection {
 
                 Intent serviceIntent = new Intent();
                 serviceIntent.setAction("org.openintents.crypto.ICryptoService");
-                serviceIntent.setPackage(cryptoProviderPackageName); // TODO: test
+                serviceIntent.setPackage(cryptoProviderPackageName);
                 mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
                         Context.BIND_AUTO_CREATE);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
index b1d248e42..7ffc42022 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
@@ -1,19 +1,36 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.sufficientlysecure.keychain.crypto_provider;
 
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.PgpMain;
-import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
-import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
 import android.view.View;
@@ -22,21 +39,81 @@ import android.widget.Button;
 
 public class CryptoActivity extends SherlockFragmentActivity {
 
+    public static final String ACTION_REGISTER = "org.sufficientlysecure.keychain.REGISTER";
     public static final String ACTION_CACHE_PASSPHRASE = "org.sufficientlysecure.keychain.CRYPTO_CACHE_PASSPHRASE";
 
-    public static final String EXTRA_SECRET_KEY_ID = "secret_key_id";
+    public static final String EXTRA_SECRET_KEY_ID = "secretKeyId";
+    public static final String EXTRA_PACKAGE_NAME = "packageName";
+
+    private ICryptoServiceActivity mService;
+    private boolean mServiceBound;
+
+    private ServiceConnection mServiceActivityConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = ICryptoServiceActivity.Stub.asInterface(service);
+            Log.d(Constants.TAG, "connected to ICryptoServiceActivity");
+            mServiceBound = true;
+        }
+
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+            Log.d(Constants.TAG, "disconnected from ICryptoServiceActivity");
+            mServiceBound = false;
+        }
+    };
+
+    /**
+     * If not already bound, bind!
+     * 
+     * @return
+     */
+    public boolean bindToService() {
+        if (mService == null && !mServiceBound) { // if not already connected
+            try {
+                Log.d(Constants.TAG, "not bound yet");
+
+                Intent serviceIntent = new Intent();
+                serviceIntent.setAction("org.openintents.crypto.ICryptoService");
+                bindService(serviceIntent, mServiceActivityConnection, Context.BIND_AUTO_CREATE);
+
+                return true;
+            } catch (Exception e) {
+                Log.d(Constants.TAG, "Exception", e);
+                return false;
+            }
+        } else { // already connected
+            Log.d(Constants.TAG, "already bound... ");
+            return true;
+        }
+    }
+
+    public void unbindFromService() {
+        unbindService(mServiceActivityConnection);
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        Log.d(Constants.TAG, "onCreate…");
+
+        // bind to our own crypto service
+        bindToService();
+
         handleActions(getIntent());
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        // unbind from our crypto service
+        if (mServiceActivityConnection != null) {
+            unbindFromService();
+        }
+    }
+
     protected void handleActions(Intent intent) {
-
-        // TODO: Important: Check if calling package is in list!
-
         String action = intent.getAction();
         Bundle extras = intent.getExtras();
 
@@ -47,7 +124,35 @@ public class CryptoActivity extends SherlockFragmentActivity {
         /**
          * com.android.crypto actions
          */
-        if (ACTION_CACHE_PASSPHRASE.equals(action)) {
+        if (ACTION_REGISTER.equals(action)) {
+            final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
+
+            setContentView(R.layout.register_crypto_consumer_activity);
+
+            Button allowButton = (Button) findViewById(R.id.register_crypto_consumer_allow);
+            Button disallowButton = (Button) findViewById(R.id.register_crypto_consumer_disallow);
+
+            allowButton.setOnClickListener(new OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    // ProviderHelper.addCryptoConsumer(RegisterActivity.this, callingPackageName);
+                    // Intent data = new Intent();
+
+                    setResult(RESULT_OK);
+                    finish();
+                }
+            });
+
+            disallowButton.setOnClickListener(new OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    setResult(RESULT_CANCELED);
+                    finish();
+                }
+            });
+        } else if (ACTION_CACHE_PASSPHRASE.equals(action)) {
             long secretKeyId = extras.getLong(EXTRA_SECRET_KEY_ID);
 
             showPassphraseDialog(secretKeyId);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index a367c613f..10eb94c7f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -20,6 +20,9 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import org.openintents.crypto.CryptoError;
 import org.openintents.crypto.CryptoSignatureResult;
@@ -29,8 +32,10 @@ import org.sufficientlysecure.keychain.helper.PgpMain;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.util.PausableThreadPoolExecutor;
 
 import org.openintents.crypto.ICryptoCallback;
 import org.openintents.crypto.ICryptoService;
@@ -38,6 +43,7 @@ import org.openintents.crypto.ICryptoService;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
@@ -45,11 +51,26 @@ import android.os.RemoteException;
 public class CryptoService extends Service {
     Context mContext;
 
+    // just one pool of 4 threads, pause on every user action needed
+    final ArrayBlockingQueue<Runnable> mPoolQueue = new ArrayBlockingQueue<Runnable>(20);
+    PausableThreadPoolExecutor mThreadPool = new PausableThreadPoolExecutor(2, 4, 10,
+            TimeUnit.SECONDS, mPoolQueue);
+
+    private ArrayList<String> mAllowedPackages;
+
+    // RemoteCallbackList<IInterface>
+
+    public static final String ACTION_SERVICE_ACTIVITY = "org.sufficientlysecure.keychain.crypto_provider.ICryptoServiceActivity";
+
     @Override
     public void onCreate() {
         super.onCreate();
         mContext = this;
         Log.d(Constants.TAG, "CryptoService, onCreate()");
+
+        // load allowed packages from database
+        mAllowedPackages = ProviderHelper.getCryptoConsumers(mContext);
+        Log.d(Constants.TAG, "allowed: " + mAllowedPackages);
     }
 
     @Override
@@ -60,7 +81,20 @@ public class CryptoService extends Service {
 
     @Override
     public IBinder onBind(Intent intent) {
-        return mBinder;
+        // return different binder for connections from internal service activity
+        if (ACTION_SERVICE_ACTIVITY.equals(intent.getAction())) {
+            String callingPackageName = intent.getPackage();
+
+            // this binder can only be used from OpenPGP Keychain
+            if (callingPackageName.equals(Constants.PACKAGE_NAME)) {
+                return mBinderServiceActivity;
+            } else {
+                Log.e(Constants.TAG, "This binder can only be used from " + Constants.PACKAGE_NAME);
+                return null;
+            }
+        } else {
+            return mBinder;
+        }
     }
 
     private synchronized void decryptAndVerifySafe(byte[] inputBytes, ICryptoCallback callback)
@@ -77,8 +111,8 @@ public class CryptoService extends Service {
             if (secretKeyId == Id.key.none) {
                 throw new PgpMain.PgpGeneralException(getString(R.string.error_noSecretKeyFound));
             }
-            
-            Log.d(Constants.TAG, "Got input:\n"+new String(inputBytes));
+
+            Log.d(Constants.TAG, "Got input:\n" + new String(inputBytes));
 
             Log.d(Constants.TAG, "secretKeyId " + secretKeyId);
 
@@ -86,13 +120,11 @@ public class CryptoService extends Service {
 
             if (passphrase == null) {
                 Log.d(Constants.TAG, "No passphrase! Activity required!");
-                // No passphrase cached for this ciphertext! Intent required to cache
-                // passphrase!
-                Intent intent = new Intent(CryptoActivity.ACTION_CACHE_PASSPHRASE);
-                intent.putExtra(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
-                // TODO: start activity bind to service from activity send back intent on success
-//                callback.onActivityRequired(intent);
-                return;
+
+                // start passphrase dialog
+                Bundle extras = new Bundle();
+                extras.putLong(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
+                pauseQueueAndStartCryptoActivity(CryptoActivity.ACTION_CACHE_PASSPHRASE, extras);
             }
 
             // if (signedOnly) {
@@ -162,37 +194,111 @@ public class CryptoService extends Service {
         }
 
         @Override
-        public void decryptAndVerify(byte[] inputBytes, ICryptoCallback callback)
+        public void decryptAndVerify(final byte[] inputBytes, final ICryptoCallback callback)
                 throws RemoteException {
-            decryptAndVerifySafe(inputBytes, callback);
+
+            Runnable r = new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        decryptAndVerifySafe(inputBytes, callback);
+                    } catch (RemoteException e) {
+                        Log.e(Constants.TAG, "CryptoService", e);
+                    }
+                }
+            };
+
+            checkAndEnqueue(r);
         }
 
     };
 
-    // /**
-    // * As we can not throw an exception through Android RPC, we assign identifiers to the
-    // exception
-    // * types.
-    // *
-    // * @param e
-    // * @return
-    // */
-    // private int getExceptionId(Exception e) {
-    // if (e instanceof NoSuchProviderException) {
-    // return 0;
-    // } else if (e instanceof NoSuchAlgorithmException) {
-    // return 1;
-    // } else if (e instanceof SignatureException) {
-    // return 2;
-    // } else if (e instanceof IOException) {
-    // return 3;
-    // } else if (e instanceof PgpGeneralException) {
-    // return 4;
-    // } else if (e instanceof PGPException) {
-    // return 5;
-    // } else {
-    // return -1;
-    // }
-    // }
+    private final ICryptoServiceActivity.Stub mBinderServiceActivity = new ICryptoServiceActivity.Stub() {
+
+        @Override
+        public void register(boolean success, String packageName) throws RemoteException {
+            if (success) {
+                // reload allowed packages
+                mAllowedPackages = ProviderHelper.getCryptoConsumers(mContext);
+
+                // resume threads
+                if (isCallerAllowed()) {
+                    mThreadPool.resume();
+                } else {
+                    // TODO: should not happen?
+                }
+            } else {
+                // TODO
+                mPoolQueue.clear();
+            }
+
+        }
+
+        @Override
+        public void cachePassphrase(boolean success, String passphrase) throws RemoteException {
+
+        }
+
+    };
+
+    private void checkAndEnqueue(Runnable r) {
+        if (isCallerAllowed()) {
+            mThreadPool.execute(r);
+
+            Log.d(Constants.TAG, "Enqueued runnable…");
+        } else {
+            Log.e(Constants.TAG, "Not allowed to use service! Starting register with activity!");
+            pauseQueueAndStartCryptoActivity(CryptoActivity.ACTION_REGISTER, null);
+            mThreadPool.execute(r);
+
+            Log.d(Constants.TAG, "Enqueued runnable…");
+        }
+    }
+
+    /**
+     * Checks if process that binds to this service (i.e. the package name corresponding to the
+     * process) is in the list of allowed package names.
+     * 
+     * @return true if process is allowed to use this service
+     */
+    private boolean isCallerAllowed() {
+        String[] callingPackages = getPackageManager().getPackagesForUid(Binder.getCallingUid());
+
+        // is calling package allowed to use this service?
+        for (int i = 0; i < callingPackages.length; i++) {
+            String currentPkg = callingPackages[i];
+            Log.d(Constants.TAG, "Caller packageName: " + currentPkg);
+
+            // check if package is allowed to use our service
+            if (mAllowedPackages.contains(currentPkg)) {
+                Log.d(Constants.TAG, "Caller is allowed! packageName: " + currentPkg);
+
+                return true;
+            } else if (Constants.PACKAGE_NAME.equals(currentPkg)) {
+                Log.d(Constants.TAG, "Caller is OpenPGP Keychain! -> allowed!");
+
+                return true;
+            }
+        }
+        
+        Log.d(Constants.TAG, "Caller is NOT allowed!");
+        return false;
+    }
+
+    private void pauseQueueAndStartCryptoActivity(String action, Bundle extras) {
+        mThreadPool.pause();
+
+        Log.d(Constants.TAG, "starting activity...");
+        Intent intent = new Intent(getBaseContext(), CryptoActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        // intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        // intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+        intent.setAction(action);
+        if (extras != null) {
+            intent.putExtras(extras);
+        }
+        getApplication().startActivity(intent);
+    }
 
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl
new file mode 100644
index 000000000..51586cae6
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+package org.sufficientlysecure.keychain.crypto_provider;
+
+
+interface ICryptoServiceActivity {
+       
+    
+    oneway void register(in boolean success, in String packageName);
+    
+    oneway void cachePassphrase(in boolean success, in String passphrase);
+   
+    
+}
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/RegisterActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/RegisterActivity.java
deleted file mode 100644
index 39b29f9a0..000000000
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/RegisterActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.sufficientlysecure.keychain.crypto_provider;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.util.Log;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-public class RegisterActivity extends Activity {
-
-    public static final String ACTION_REGISTER = "com.android.crypto.REGISTER";
-
-    public static final String EXTRA_PACKAGE_NAME = "packageName";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        handleActions(getIntent());
-    }
-
-    protected void handleActions(Intent intent) {
-        String action = intent.getAction();
-        Bundle extras = intent.getExtras();
-
-        if (extras == null) {
-            extras = new Bundle();
-        }
-
-        final String callingPackageName = this.getCallingPackage();
-
-        /**
-         * com.android.crypto actions
-         */
-        if (ACTION_REGISTER.equals(action)) {
-            setContentView(R.layout.register_crypto_consumer_activity);
-
-            Button allowButton = (Button) findViewById(R.id.register_crypto_consumer_allow);
-            Button disallowButton = (Button) findViewById(R.id.register_crypto_consumer_disallow);
-
-            allowButton.setOnClickListener(new OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    ProviderHelper.addCryptoConsumer(RegisterActivity.this, callingPackageName);
-                    Intent data = new Intent();
-                    data.putExtra(EXTRA_PACKAGE_NAME, "org.sufficientlysecure.keychain");
-
-                    setResult(RESULT_OK, data);
-                    finish();
-                }
-            });
-
-            disallowButton.setOnClickListener(new OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    setResult(RESULT_CANCELED);
-                    finish();
-                }
-            });
-
-        } else {
-            Log.e(Constants.TAG, "Please use com.android.crypto.REGISTER as intent action!");
-            finish();
-        }
-    }
-}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
new file mode 100644
index 000000000..d6170a4e2
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.keychain.util;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Example from
+ * http://docs.oracle.com/javase/1.5.0/docs/api/java/util/concurrent/ThreadPoolExecutor.html
+ */
+public class PausableThreadPoolExecutor extends ThreadPoolExecutor {
+
+    public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
+            TimeUnit unit, BlockingQueue<Runnable> workQueue, RejectedExecutionHandler handler) {
+        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, handler);
+    }
+
+    public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
+            TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory,
+            RejectedExecutionHandler handler) {
+        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
+    }
+
+    public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
+            TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory) {
+        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory);
+    }
+
+    public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
+            TimeUnit unit, BlockingQueue<Runnable> workQueue) {
+        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
+    }
+
+    private boolean isPaused;
+    private ReentrantLock pauseLock = new ReentrantLock();
+    private Condition unpaused = pauseLock.newCondition();
+
+    protected void beforeExecute(Thread t, Runnable r) {
+        super.beforeExecute(t, r);
+        pauseLock.lock();
+        try {
+            while (isPaused)
+                unpaused.await();
+        } catch (InterruptedException ie) {
+            t.interrupt();
+        } finally {
+            pauseLock.unlock();
+        }
+    }
+
+    public void pause() {
+        pauseLock.lock();
+        try {
+            isPaused = true;
+        } finally {
+            pauseLock.unlock();
+        }
+    }
+
+    public void resume() {
+        pauseLock.lock();
+        try {
+            isPaused = false;
+            unpaused.signalAll();
+        } finally {
+            pauseLock.unlock();
+        }
+    }
+}
\ No newline at end of file

From 918bab3a4e7b582dce5b994e115ca8de37da4ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 17 Jun 2013 16:05:39 +0200
Subject: [PATCH 05/26] Rename foir clarification

---
 OpenPGP-Keychain/AndroidManifest.xml               |  2 +-
 .../keychain/crypto_provider/CryptoService.java    | 14 +++++++-------
 ...Activity.aidl => IServiceActivityCallback.aidl} |  6 +++---
 .../{CryptoActivity.java => ServiceActivity.java}  |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/{ICryptoServiceActivity.aidl => IServiceActivityCallback.aidl} (94%)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/{CryptoActivity.java => ServiceActivity.java} (97%)

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 0b8ed515e..7796f4446 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -478,7 +478,7 @@
                 <action android:name="org.openintents.crypto.ICryptoService" />
 
                 <!-- Can only be used from OpenPGP Keychain (internal): -->
-                <action android:name="org.sufficientlysecure.keychain.crypto_provider.ICryptoServiceActivity" />
+                <action android:name="org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback" />
             </intent-filter>
 
             <meta-data
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index 10eb94c7f..3748ef521 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -60,7 +60,7 @@ public class CryptoService extends Service {
 
     // RemoteCallbackList<IInterface>
 
-    public static final String ACTION_SERVICE_ACTIVITY = "org.sufficientlysecure.keychain.crypto_provider.ICryptoServiceActivity";
+    public static final String ACTION_SERVICE_ACTIVITY = "org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback";
 
     @Override
     public void onCreate() {
@@ -123,8 +123,8 @@ public class CryptoService extends Service {
 
                 // start passphrase dialog
                 Bundle extras = new Bundle();
-                extras.putLong(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
-                pauseQueueAndStartCryptoActivity(CryptoActivity.ACTION_CACHE_PASSPHRASE, extras);
+                extras.putLong(ServiceActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
+                pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_CACHE_PASSPHRASE, extras);
             }
 
             // if (signedOnly) {
@@ -214,7 +214,7 @@ public class CryptoService extends Service {
 
     };
 
-    private final ICryptoServiceActivity.Stub mBinderServiceActivity = new ICryptoServiceActivity.Stub() {
+    private final IServiceActivityCallback.Stub mBinderServiceActivity = new IServiceActivityCallback.Stub() {
 
         @Override
         public void register(boolean success, String packageName) throws RemoteException {
@@ -249,7 +249,7 @@ public class CryptoService extends Service {
             Log.d(Constants.TAG, "Enqueued runnable…");
         } else {
             Log.e(Constants.TAG, "Not allowed to use service! Starting register with activity!");
-            pauseQueueAndStartCryptoActivity(CryptoActivity.ACTION_REGISTER, null);
+            pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_REGISTER, null);
             mThreadPool.execute(r);
 
             Log.d(Constants.TAG, "Enqueued runnable…");
@@ -286,11 +286,11 @@ public class CryptoService extends Service {
         return false;
     }
 
-    private void pauseQueueAndStartCryptoActivity(String action, Bundle extras) {
+    private void pauseQueueAndStartServiceActivity(String action, Bundle extras) {
         mThreadPool.pause();
 
         Log.d(Constants.TAG, "starting activity...");
-        Intent intent = new Intent(getBaseContext(), CryptoActivity.class);
+        Intent intent = new Intent(getBaseContext(), ServiceActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         // intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         // intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
similarity index 94%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
index 51586cae6..61a8da06c 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
@@ -17,12 +17,12 @@
 package org.sufficientlysecure.keychain.crypto_provider;
 
 
-interface ICryptoServiceActivity {
-       
+interface IServiceActivityCallback {
+    
     
     oneway void register(in boolean success, in String packageName);
     
     oneway void cachePassphrase(in boolean success, in String passphrase);
-   
+    
     
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
similarity index 97%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
index 7ffc42022..9f68aab97 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
@@ -37,7 +37,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
-public class CryptoActivity extends SherlockFragmentActivity {
+public class ServiceActivity extends SherlockFragmentActivity {
 
     public static final String ACTION_REGISTER = "org.sufficientlysecure.keychain.REGISTER";
     public static final String ACTION_CACHE_PASSPHRASE = "org.sufficientlysecure.keychain.CRYPTO_CACHE_PASSPHRASE";
@@ -45,12 +45,12 @@ public class CryptoActivity extends SherlockFragmentActivity {
     public static final String EXTRA_SECRET_KEY_ID = "secretKeyId";
     public static final String EXTRA_PACKAGE_NAME = "packageName";
 
-    private ICryptoServiceActivity mService;
+    private IServiceActivityCallback mService;
     private boolean mServiceBound;
 
     private ServiceConnection mServiceActivityConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName name, IBinder service) {
-            mService = ICryptoServiceActivity.Stub.asInterface(service);
+            mService = IServiceActivityCallback.Stub.asInterface(service);
             Log.d(Constants.TAG, "connected to ICryptoServiceActivity");
             mServiceBound = true;
         }

From 1b29330f18e2026d15fc6f28ac34624c4abd4b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 17 Jun 2013 16:17:59 +0200
Subject: [PATCH 06/26] Fix activity manifest entry

---
 .../keychain/demo/CryptoProviderDemoActivity.java            | 5 ++---
 OpenPGP-Keychain/AndroidManifest.xml                         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
index 03668fcab..4522110f0 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -23,6 +23,7 @@ import org.openintents.crypto.CryptoError;
 import org.openintents.crypto.CryptoServiceConnection;
 import org.openintents.crypto.CryptoSignatureResult;
 import org.openintents.crypto.ICryptoCallback;
+import org.openintents.crypto.ICryptoService;
 import org.sufficientlysecure.keychain.demo.R;
 import org.sufficientlysecure.keychain.integration.Constants;
 
@@ -50,8 +51,6 @@ public class CryptoProviderDemoActivity extends Activity {
 
     private CryptoServiceConnection mCryptoServiceConnection;
 
-    private static final String CRYPTO_SERVICE_INTENT = "org.openintents.crypto.ICryptoService";
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -142,7 +141,7 @@ public class CryptoProviderDemoActivity extends Activity {
     }
 
     private void selectCryptoProvider() {
-        Intent intent = new Intent(CRYPTO_SERVICE_INTENT);
+        Intent intent = new Intent(ICryptoService.class.getName());
 
         final ArrayList<CryptoProviderElement> providerList = new ArrayList<CryptoProviderElement>();
 
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 7796f4446..0f80604ef 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -459,7 +459,7 @@
         <!-- Crypto Provider internal intents -->
 
         <activity
-            android:name=".crypto_provider.CryptoActivity"
+            android:name=".crypto_provider.ServiceActivity"
             android:exported="false"
             android:label="TODO crypto activity"
             android:process=":crypto" >

From 0f3e78ebf7d0c71a18fef55e543c5b54a066735b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 17 Jun 2013 16:59:27 +0200
Subject: [PATCH 07/26] Possible to add allowed packages

---
 .../crypto/CryptoServiceConnection.java       |  2 +-
 .../crypto_provider/CryptoService.java        | 45 ++++++++++++-------
 .../crypto_provider/ServiceActivity.java      |  3 +-
 .../keychain/provider/KeychainContract.java   |  4 ++
 .../keychain/provider/KeychainProvider.java   |  9 +++-
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java
index 5df32dcf9..d9e91f772 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/CryptoServiceConnection.java
@@ -69,7 +69,7 @@ public class CryptoServiceConnection {
 
                 Intent serviceIntent = new Intent();
                 serviceIntent.setAction("org.openintents.crypto.ICryptoService");
-                serviceIntent.setPackage(cryptoProviderPackageName); // TODO: test
+                serviceIntent.setPackage(cryptoProviderPackageName);
                 mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
                         Context.BIND_AUTO_CREATE);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index 3748ef521..a70641b58 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -58,8 +58,6 @@ public class CryptoService extends Service {
 
     private ArrayList<String> mAllowedPackages;
 
-    // RemoteCallbackList<IInterface>
-
     public static final String ACTION_SERVICE_ACTIVITY = "org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback";
 
     @Override
@@ -218,12 +216,13 @@ public class CryptoService extends Service {
 
         @Override
         public void register(boolean success, String packageName) throws RemoteException {
+
             if (success) {
                 // reload allowed packages
                 mAllowedPackages = ProviderHelper.getCryptoConsumers(mContext);
 
                 // resume threads
-                if (isCallerAllowed()) {
+                if (isPackageAllowed(packageName)) {
                     mThreadPool.resume();
                 } else {
                     // TODO: should not happen?
@@ -248,8 +247,15 @@ public class CryptoService extends Service {
 
             Log.d(Constants.TAG, "Enqueued runnable…");
         } else {
-            Log.e(Constants.TAG, "Not allowed to use service! Starting register with activity!");
-            pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_REGISTER, null);
+            String[] callingPackages = getPackageManager()
+                    .getPackagesForUid(Binder.getCallingUid());
+
+            Log.e(Constants.TAG, "Not allowed to use service! Starting activity for registration!");
+            Bundle extras = new Bundle();
+            // TODO: currently simply uses first entry
+            extras.putString(ServiceActivity.EXTRA_PACKAGE_NAME, callingPackages[0]);
+            pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_REGISTER, extras);
+
             mThreadPool.execute(r);
 
             Log.d(Constants.TAG, "Enqueued runnable…");
@@ -268,24 +274,33 @@ public class CryptoService extends Service {
         // is calling package allowed to use this service?
         for (int i = 0; i < callingPackages.length; i++) {
             String currentPkg = callingPackages[i];
-            Log.d(Constants.TAG, "Caller packageName: " + currentPkg);
-
-            // check if package is allowed to use our service
-            if (mAllowedPackages.contains(currentPkg)) {
-                Log.d(Constants.TAG, "Caller is allowed! packageName: " + currentPkg);
-
-                return true;
-            } else if (Constants.PACKAGE_NAME.equals(currentPkg)) {
-                Log.d(Constants.TAG, "Caller is OpenPGP Keychain! -> allowed!");
 
+            if (isPackageAllowed(currentPkg)) {
                 return true;
             }
         }
-        
+
         Log.d(Constants.TAG, "Caller is NOT allowed!");
         return false;
     }
 
+    private boolean isPackageAllowed(String packageName) {
+        Log.d(Constants.TAG, "packageName: " + packageName);
+
+        // check if package is allowed to use our service
+        if (mAllowedPackages.contains(packageName)) {
+            Log.d(Constants.TAG, "Package is allowed! packageName: " + packageName);
+
+            return true;
+        } else if (Constants.PACKAGE_NAME.equals(packageName)) {
+            Log.d(Constants.TAG, "Package is OpenPGP Keychain! -> allowed!");
+
+            return true;
+        }
+
+        return false;
+    }
+
     private void pauseQueueAndStartServiceActivity(String action, Bundle extras) {
         mThreadPool.pause();
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
index 9f68aab97..7efce85c7 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.crypto_provider;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
@@ -136,7 +137,7 @@ public class ServiceActivity extends SherlockFragmentActivity {
 
                 @Override
                 public void onClick(View v) {
-                    // ProviderHelper.addCryptoConsumer(RegisterActivity.this, callingPackageName);
+                    ProviderHelper.addCryptoConsumer(ServiceActivity.this, packageName);
                     // Intent data = new Intent();
 
                     setResult(RESULT_OK);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 46928c6fa..776d1bfb9 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -222,6 +222,10 @@ public class KeychainContract {
 
         /** Use if a single item is returned */
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.crypto_consumers";
+
+        public static Uri buildIdUri(String rowId) {
+            return CONTENT_URI.buildUpon().appendPath(rowId).build();
+        }
     }
 
     public static class DataStream {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 49286b9ce..70be38e21 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -600,10 +600,10 @@ public class KeychainProvider extends ContentProvider {
             qb.appendWhereEscapeString(uri.getLastPathSegment());
 
             break;
-            
+
         case CRYPTO_CONSUMERS:
             qb.setTables(Tables.CRYPTO_CONSUMERS);
-            
+
             break;
 
         default:
@@ -685,6 +685,11 @@ public class KeychainProvider extends ContentProvider {
                 rowId = db.insertOrThrow(Tables.USER_IDS, null, values);
                 rowUri = UserIds.buildSecretUserIdsUri(Long.toString(rowId));
 
+                break;
+            case CRYPTO_CONSUMERS:
+                rowId = db.insertOrThrow(Tables.CRYPTO_CONSUMERS, null, values);
+                rowUri = CryptoConsumers.buildIdUri(Long.toString(rowId));
+
                 break;
             default:
                 throw new UnsupportedOperationException("Unknown uri: " + uri);

From d4e054d5f24afeef8859c9294f3ef1b69242b037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 17 Jun 2013 19:51:41 +0200
Subject: [PATCH 08/26] some fixes all over

---
 .../res/layout/crypto_provider_demo.xml       | 69 ++++++++++++++-----
 .../openintents/crypto/ICryptoService.aidl    | 24 +++----
 .../demo/CryptoProviderDemoActivity.java      | 54 +++++++++++----
 .../openintents/crypto/ICryptoService.aidl    | 24 +++----
 .../crypto_provider/CryptoService.java        | 66 ++++++++++++++----
 .../keychain/provider/KeychainProvider.java   | 49 +++++++++++--
 6 files changed, 209 insertions(+), 77 deletions(-)

diff --git a/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
index ecc2b4ac5..e4c9e1441 100644
--- a/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
+++ b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
@@ -8,12 +8,37 @@
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
-        <Button
-            android:id="@+id/crypto_provider_demo_register"
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Encrypt User Id"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <EditText
+            android:id="@+id/crypto_provider_demo_encrypt_user_id"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="registerCryptoProvider"
-            android:text="Register crypto provider" />
+            android:text="dominik@dominikschuermann.de"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Sign User Id"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <EditText
+            android:id="@+id/crypto_provider_demo_sign_user_id"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="dominik@dominikschuermann.de"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Message"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <EditText
             android:id="@+id/crypto_provider_demo_message"
@@ -22,25 +47,17 @@
             android:text="message"
             android:textAppearance="@android:style/TextAppearance.Small" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Ciphertext"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
         <EditText
             android:id="@+id/crypto_provider_demo_ciphertext"
             android:layout_width="match_parent"
             android:layout_height="150dip"
-            android:text="-----BEGIN PGP MESSAGE-----
-Charset: UTF-8
-Version: GnuPG v1.4.12 (GNU/Linux)
-Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-
-hQEMAwCgOoTtKmfpAQgAlzmyQYCfkalCsAIxwtroHV9Bwz5LWY4GJNVrFBVddSFJ
-VkVxx/UDqtIS+TvL8RBG3Er3xFilTV+iBSDjSGIXHkSv6Z7Od69nKcQpJLNaCpDj
-/Ag7PsINLUzAvUdPto3ZMCwShe/uoD4e4Gr5BG8na/9W77tegufS2gUUlc5BAOZP
-GUlSPySJP2bpI/3U/R86Z2ByzFKeJIEKWBtBvMPmIgA5VPo0+mamTedRhOIrJM/R
-vUMM2HfLjAxcX9lYEw4aQGROOu1xpN9FPojQOO10imibZb+TEcxtSHwpj2vll1BP
-pXvtuR0E9OGVmRI9aBXiRTB2P9SJ6UPpR13m8FaLVtJPAa2xH4wA5Yr6uZ5x7LjO
-BtO8VErKgoUpO57BgU1ZsVFEcrGiobkreXabKIB+qC0qMJ6maoLlnOPi1IAvhU42
-z/7HBqqhcNiHc5JMs9+wmw==
-=00nh
------END PGP MESSAGE-----"
+            android:text="ciphertext"
             android:textAppearance="@android:style/TextAppearance.Small" />
 
         <Button
@@ -50,6 +67,20 @@ z/7HBqqhcNiHc5JMs9+wmw==
             android:onClick="encryptOnClick"
             android:text="Encrypt" />
 
+        <Button
+            android:id="@+id/crypto_provider_demo_sign"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="signOnClick"
+            android:text="Sign" />
+
+        <Button
+            android:id="@+id/crypto_provider_demo_encrypt_and_sign"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="encryptAndSignOnClick"
+            android:text="Encrypt and Sign" />
+
         <Button
             android:id="@+id/crypto_provider_demo_decrypt"
             android:layout_width="match_parent"
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
index 04c8eb30e..53f39dffc 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
@@ -36,6 +36,18 @@ interface ICryptoService {
      */
     oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
     
+    /**
+     * Sign
+     *
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
+     */
+    oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
+    
     /**
      * Encrypt and sign
      *
@@ -50,18 +62,6 @@ interface ICryptoService {
      */
     oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, in ICryptoCallback callback);
     
-    /**
-     * Sign
-     *
-     * @param inputBytes
-     *            Byte array you want to encrypt
-     * @param signatureUserId
-     *            User Ids (email) of sender
-     * @param callback
-     *            Callback where to return results
-     */
-    oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
-    
     /**
      * Decrypts and verifies given input bytes. If no signature is present this method
      * will only decrypt.
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
index 4522110f0..831c269e1 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -39,15 +39,17 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.EditText;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
 public class CryptoProviderDemoActivity extends Activity {
     Activity mActivity;
 
-    TextView mMessageTextView;
-    TextView mCiphertextTextView;
-    TextView mDataTextView;
+    EditText mMessage;
+    EditText mCiphertext;
+    EditText mEncryptUserId;
+    EditText mSignUserId;
 
     private CryptoServiceConnection mCryptoServiceConnection;
 
@@ -58,9 +60,10 @@ public class CryptoProviderDemoActivity extends Activity {
 
         mActivity = this;
 
-        mMessageTextView = (TextView) findViewById(R.id.crypto_provider_demo_message);
-        mCiphertextTextView = (TextView) findViewById(R.id.crypto_provider_demo_ciphertext);
-        mDataTextView = (TextView) findViewById(R.id.aidl_demo_data);
+        mMessage = (EditText) findViewById(R.id.crypto_provider_demo_message);
+        mCiphertext = (EditText) findViewById(R.id.crypto_provider_demo_ciphertext);
+        mEncryptUserId = (EditText) findViewById(R.id.crypto_provider_demo_encrypt_user_id);
+        mSignUserId = (EditText) findViewById(R.id.crypto_provider_demo_sign_user_id);
 
         selectCryptoProvider();
     }
@@ -72,7 +75,9 @@ public class CryptoProviderDemoActivity extends Activity {
 
         @Override
         public void onEncryptSignSuccess(byte[] outputBytes) throws RemoteException {
-            // not needed here
+            Log.d(Constants.TAG, "onEncryptSignSuccess");
+
+            // TODO
         }
 
         @Override
@@ -80,32 +85,53 @@ public class CryptoProviderDemoActivity extends Activity {
                 throws RemoteException {
             Log.d(Constants.TAG, "onDecryptVerifySuccess");
 
-            // PgpData data = new PgpData();
-            // data.setDecryptedData(new String(outputBytes));
-            // mFragment.setMessageWithPgpData(data);
+            mMessage.setText(new String(outputBytes));
         }
 
         @Override
         public void onError(CryptoError error) throws RemoteException {
             Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId());
-            Log.e(Constants.TAG, "onError getErrorId:" + error.getMessage());
+            Log.e(Constants.TAG, "onError getMessage:" + error.getMessage());
         }
 
     };
 
     public void encryptOnClick(View view) {
-        byte[] inputBytes = mMessageTextView.getText().toString().getBytes();
+        byte[] inputBytes = mMessage.getText().toString().getBytes();
 
         try {
             mCryptoServiceConnection.getService().encrypt(inputBytes,
-                    new String[] { "dominik@dominikschuermann.de" }, callback);
+                    new String[] { mEncryptUserId.getText().toString() }, callback);
+        } catch (RemoteException e) {
+            Log.e(Constants.TAG, "CryptoProviderDemo", e);
+        }
+    }
+
+    public void signOnClick(View view) {
+        byte[] inputBytes = mMessage.getText().toString().getBytes();
+
+        try {
+            mCryptoServiceConnection.getService().sign(inputBytes,
+                    mSignUserId.getText().toString(), callback);
+        } catch (RemoteException e) {
+            Log.e(Constants.TAG, "CryptoProviderDemo", e);
+        }
+    }
+
+    public void encryptAndSignOnClick(View view) {
+        byte[] inputBytes = mMessage.getText().toString().getBytes();
+
+        try {
+            mCryptoServiceConnection.getService().encryptAndSign(inputBytes,
+                    new String[] { mEncryptUserId.getText().toString() },
+                    mSignUserId.getText().toString(), callback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
     }
 
     public void decryptOnClick(View view) {
-        byte[] inputBytes = mCiphertextTextView.getText().toString().getBytes();
+        byte[] inputBytes = mCiphertext.getText().toString().getBytes();
 
         try {
             mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, callback);
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
index 04c8eb30e..53f39dffc 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
@@ -36,6 +36,18 @@ interface ICryptoService {
      */
     oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
     
+    /**
+     * Sign
+     *
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
+     */
+    oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
+    
     /**
      * Encrypt and sign
      *
@@ -50,18 +62,6 @@ interface ICryptoService {
      */
     oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, in ICryptoCallback callback);
     
-    /**
-     * Sign
-     *
-     * @param inputBytes
-     *            Byte array you want to encrypt
-     * @param signatureUserId
-     *            User Ids (email) of sender
-     * @param callback
-     *            Callback where to return results
-     */
-    oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
-    
     /**
      * Decrypts and verifies given input bytes. If no signature is present this method
      * will only decrypt.
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index a70641b58..7ff8c0e3e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -56,8 +56,6 @@ public class CryptoService extends Service {
     PausableThreadPoolExecutor mThreadPool = new PausableThreadPoolExecutor(2, 4, 10,
             TimeUnit.SECONDS, mPoolQueue);
 
-    private ArrayList<String> mAllowedPackages;
-
     public static final String ACTION_SERVICE_ACTIVITY = "org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback";
 
     @Override
@@ -65,10 +63,6 @@ public class CryptoService extends Service {
         super.onCreate();
         mContext = this;
         Log.d(Constants.TAG, "CryptoService, onCreate()");
-
-        // load allowed packages from database
-        mAllowedPackages = ProviderHelper.getCryptoConsumers(mContext);
-        Log.d(Constants.TAG, "allowed: " + mAllowedPackages);
     }
 
     @Override
@@ -95,6 +89,40 @@ public class CryptoService extends Service {
         }
     }
 
+    private synchronized void encryptSafe(byte[] inputBytes, String[] encryptionUserIds,
+            ICryptoCallback callback) throws RemoteException {
+        try {
+            // build InputData and write into OutputStream
+            InputStream inputStream = new ByteArrayInputStream(inputBytes);
+            long inputLength = inputBytes.length;
+            InputData inputData = new InputData(inputStream, inputLength);
+
+            OutputStream outStream = new ByteArrayOutputStream();
+
+            // TODO: hardcoded...
+            boolean useAsciiArmor = true;
+            int compressionId = 2; // zlib
+
+            // PgpMain.encryptAndSign(this, this, inputData, outStream, useAsciiArmor,
+            // compressionId, encryptionKeyIds, encryptionPassphrase, Preferences
+            // .getPreferences(this).getDefaultEncryptionAlgorithm(),
+            // secretKeyId,
+            // Preferences.getPreferences(this).getDefaultHashAlgorithm(), Preferences
+            // .getPreferences(this).getForceV3Signatures(),
+            // PassphraseCacheService.getCachedPassphrase(this, secretKeyId));
+
+            outStream.close();
+        } catch (Exception e) {
+            Log.e(Constants.TAG, "KeychainService, Exception!", e);
+
+            try {
+                callback.onError(new CryptoError(0, e.getMessage()));
+            } catch (Exception t) {
+                Log.e(Constants.TAG, "Error returning exception to client", t);
+            }
+        }
+    }
+
     private synchronized void decryptAndVerifySafe(byte[] inputBytes, ICryptoCallback callback)
             throws RemoteException {
         try {
@@ -171,10 +199,22 @@ public class CryptoService extends Service {
     private final ICryptoService.Stub mBinder = new ICryptoService.Stub() {
 
         @Override
-        public void encrypt(byte[] inputBytes, String[] encryptionUserIds, ICryptoCallback callback)
-                throws RemoteException {
-            // TODO Auto-generated method stub
+        public void encrypt(final byte[] inputBytes, final String[] encryptionUserIds,
+                final ICryptoCallback callback) throws RemoteException {
 
+            Runnable r = new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        encryptSafe(inputBytes, encryptionUserIds, callback);
+                    } catch (RemoteException e) {
+                        Log.e(Constants.TAG, "CryptoService", e);
+                    }
+                }
+            };
+
+            checkAndEnqueue(r);
         }
 
         @Override
@@ -218,9 +258,6 @@ public class CryptoService extends Service {
         public void register(boolean success, String packageName) throws RemoteException {
 
             if (success) {
-                // reload allowed packages
-                mAllowedPackages = ProviderHelper.getCryptoConsumers(mContext);
-
                 // resume threads
                 if (isPackageAllowed(packageName)) {
                     mThreadPool.resume();
@@ -287,8 +324,11 @@ public class CryptoService extends Service {
     private boolean isPackageAllowed(String packageName) {
         Log.d(Constants.TAG, "packageName: " + packageName);
 
+        ArrayList<String> allowedPkgs = ProviderHelper.getCryptoConsumers(mContext);
+        Log.d(Constants.TAG, "allowed: " + allowedPkgs);
+
         // check if package is allowed to use our service
-        if (mAllowedPackages.contains(packageName)) {
+        if (allowedPkgs.contains(packageName)) {
             Log.d(Constants.TAG, "Package is allowed! packageName: " + packageName);
 
             return true;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 70be38e21..a34cda0c3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2012-2013 Dominik Schürmann <dominik@dominikschuermann.de>
  * Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,6 @@
 
 package org.sufficientlysecure.keychain.provider;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.util.Arrays;
 import java.util.HashMap;
 
@@ -44,7 +42,6 @@ import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
 import android.text.TextUtils;
 
@@ -82,6 +79,7 @@ public class KeychainProvider extends ContentProvider {
     private static final int SECRET_KEY_RING_USER_ID_BY_ROW_ID = 222;
 
     private static final int CRYPTO_CONSUMERS = 301;
+    private static final int CRYPTO_CONSUMERS_BY_ROW_ID = 302;
 
     // private static final int DATA_STREAM = 401;
 
@@ -230,6 +228,8 @@ public class KeychainProvider extends ContentProvider {
          * Crypto Consumers
          */
         matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS, CRYPTO_CONSUMERS);
+        matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS + "/#",
+                CRYPTO_CONSUMERS_BY_ROW_ID);
 
         /**
          * data stream
@@ -293,6 +293,9 @@ public class KeychainProvider extends ContentProvider {
         case CRYPTO_CONSUMERS:
             return CryptoConsumers.CONTENT_TYPE;
 
+        case CRYPTO_CONSUMERS_BY_ROW_ID:
+            return CryptoConsumers.CONTENT_ITEM_TYPE;
+
         default:
             throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
@@ -653,6 +656,7 @@ public class KeychainProvider extends ContentProvider {
 
                 rowId = db.insertOrThrow(Tables.KEY_RINGS, null, values);
                 rowUri = KeyRings.buildPublicKeyRingsUri(Long.toString(rowId));
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                 break;
             case PUBLIC_KEY_RING_KEY:
@@ -660,11 +664,13 @@ public class KeychainProvider extends ContentProvider {
 
                 rowId = db.insertOrThrow(Tables.KEYS, null, values);
                 rowUri = Keys.buildPublicKeysUri(Long.toString(rowId));
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                 break;
             case PUBLIC_KEY_RING_USER_ID:
                 rowId = db.insertOrThrow(Tables.USER_IDS, null, values);
                 rowUri = UserIds.buildPublicUserIdsUri(Long.toString(rowId));
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                 break;
             case SECRET_KEY_RING:
@@ -672,6 +678,7 @@ public class KeychainProvider extends ContentProvider {
 
                 rowId = db.insertOrThrow(Tables.KEY_RINGS, null, values);
                 rowUri = KeyRings.buildSecretKeyRingsUri(Long.toString(rowId));
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                 break;
             case SECRET_KEY_RING_KEY:
@@ -679,6 +686,7 @@ public class KeychainProvider extends ContentProvider {
 
                 rowId = db.insertOrThrow(Tables.KEYS, null, values);
                 rowUri = Keys.buildSecretKeysUri(Long.toString(rowId));
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                 break;
             case SECRET_KEY_RING_USER_ID:
@@ -697,7 +705,6 @@ public class KeychainProvider extends ContentProvider {
 
             // notify of changes in db
             getContext().getContentResolver().notifyChange(uri, null);
-            sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
         } catch (SQLiteConstraintException e) {
             Log.e(Constants.TAG, "Constraint exception on insert! Entry already existing?");
@@ -725,6 +732,7 @@ public class KeychainProvider extends ContentProvider {
             count = db.delete(Tables.KEY_RINGS,
                     buildDefaultKeyRingsSelection(defaultSelection, getKeyType(match), selection),
                     selectionArgs);
+            sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
             break;
         case PUBLIC_KEY_RING_BY_MASTER_KEY_ID:
         case SECRET_KEY_RING_BY_MASTER_KEY_ID:
@@ -733,24 +741,29 @@ public class KeychainProvider extends ContentProvider {
             count = db.delete(Tables.KEY_RINGS,
                     buildDefaultKeyRingsSelection(defaultSelection, getKeyType(match), selection),
                     selectionArgs);
+            sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
             break;
         case PUBLIC_KEY_RING_KEY_BY_ROW_ID:
         case SECRET_KEY_RING_KEY_BY_ROW_ID:
             count = db.delete(Tables.KEYS,
                     buildDefaultKeysSelection(uri, getKeyType(match), selection), selectionArgs);
+            sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
             break;
         case PUBLIC_KEY_RING_USER_ID_BY_ROW_ID:
         case SECRET_KEY_RING_USER_ID_BY_ROW_ID:
             count = db.delete(Tables.KEYS, buildDefaultUserIdsSelection(uri, selection),
                     selectionArgs);
             break;
+        case CRYPTO_CONSUMERS_BY_ROW_ID:
+            count = db.delete(Tables.CRYPTO_CONSUMERS,
+                    buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs);
+            break;
         default:
             throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
 
         // notify of changes in db
         getContext().getContentResolver().notifyChange(uri, null);
-        sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
         return count;
     }
@@ -776,6 +789,8 @@ public class KeychainProvider extends ContentProvider {
                         values,
                         buildDefaultKeyRingsSelection(defaultSelection, getKeyType(match),
                                 selection), selectionArgs);
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
+
                 break;
             case PUBLIC_KEY_RING_BY_MASTER_KEY_ID:
             case SECRET_KEY_RING_BY_MASTER_KEY_ID:
@@ -786,6 +801,8 @@ public class KeychainProvider extends ContentProvider {
                         values,
                         buildDefaultKeyRingsSelection(defaultSelection, getKeyType(match),
                                 selection), selectionArgs);
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
+
                 break;
             case PUBLIC_KEY_RING_KEY_BY_ROW_ID:
             case SECRET_KEY_RING_KEY_BY_ROW_ID:
@@ -793,6 +810,8 @@ public class KeychainProvider extends ContentProvider {
                         .update(Tables.KEYS, values,
                                 buildDefaultKeysSelection(uri, getKeyType(match), selection),
                                 selectionArgs);
+                sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
+
                 break;
             case PUBLIC_KEY_RING_USER_ID_BY_ROW_ID:
             case SECRET_KEY_RING_USER_ID_BY_ROW_ID:
@@ -805,7 +824,6 @@ public class KeychainProvider extends ContentProvider {
 
             // notify of changes in db
             getContext().getContentResolver().notifyChange(uri, null);
-            sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
         } catch (SQLiteConstraintException e) {
             Log.e(Constants.TAG, "Constraint exception on update! Entry already existing?");
@@ -888,6 +906,23 @@ public class KeychainProvider extends ContentProvider {
         return BaseColumns._ID + "=" + rowId + andForeignKeyRing + andSelection;
     }
 
+    /**
+     * Build default selection statement for Crypto Consumers. If no extra selection is specified
+     * only build where clause with rowId
+     * 
+     * @param uri
+     * @param selection
+     * @return
+     */
+    private String buildDefaultCryptoConsumersSelection(Uri uri, String selection) {
+        String andSelection = "";
+        if (!TextUtils.isEmpty(selection)) {
+            andSelection = " AND (" + selection + ")";
+        }
+
+        return selection + andSelection;
+    }
+
     // @Override
     // public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
     // int match = mUriMatcher.match(uri);

From 36cc814e84135296fc14d383e61e6b4fe8dfe269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 18 Jun 2013 01:48:25 +0200
Subject: [PATCH 09/26] Add database columns for crypto consumer preferences

---
 .../keychain/provider/KeychainContract.java      | 13 ++++++++++++-
 .../keychain/provider/KeychainDatabase.java      |  6 +++++-
 .../keychain/provider/KeychainProvider.java      | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 776d1bfb9..985498e3a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -43,7 +43,7 @@ public class KeychainContract {
         String CREATION = "creation";
         String EXPIRY = "expiry";
         String KEY_RING_ROW_ID = "key_ring_row_id"; // foreign key to key_rings._ID
-        String KEY_DATA = "key_data"; // PGPPublicKey / PGPSecretKey blob
+        String KEY_DATA = "key_data"; // PGPPublicKey/PGPSecretKey blob
         String RANK = "rank";
     }
 
@@ -55,6 +55,11 @@ public class KeychainContract {
 
     interface CryptoConsumersColumns {
         String PACKAGE_NAME = "package_name";
+        String PRIVATE_KEY_ID = "private_key_id"; // not a database id
+        String ASCII_ARMOR = "ascii_armor";
+        String ENCRYPTION_ALGORITHM = "encryption_algorithm";
+        String HASH_ALORITHM = "hash_algorithm";
+        String COMPRESSION = "compression";
     }
 
     public static final class KeyTypes {
@@ -83,6 +88,7 @@ public class KeychainContract {
     public static final String PATH_KEYS = "keys";
 
     public static final String BASE_CRYPTO_CONSUMERS = "crypto_consumers";
+    public static final String PATH_BY_PACKAGE_NAME = "package_name";
 
     public static class KeyRings implements KeyRingsColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
@@ -226,6 +232,11 @@ public class KeychainContract {
         public static Uri buildIdUri(String rowId) {
             return CONTENT_URI.buildUpon().appendPath(rowId).build();
         }
+
+        public static Uri buildByPackageNameUri(String packageName) {
+            return CONTENT_URI.buildUpon().appendPath(PATH_BY_PACKAGE_NAME).appendPath(packageName)
+                    .build();
+        }
     }
 
     public static class DataStream {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index f30292b52..6f31f4945 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -67,7 +67,11 @@ public class KeychainDatabase extends SQLiteOpenHelper {
     private static final String CREATE_CRYPTO_CONSUMERS = "CREATE TABLE IF NOT EXISTS "
             + Tables.CRYPTO_CONSUMERS + " (" + BaseColumns._ID
             + " INTEGER PRIMARY KEY AUTOINCREMENT, " + CryptoConsumersColumns.PACKAGE_NAME
-            + " TEXT UNIQUE)";
+            + " TEXT UNIQUE, " + CryptoConsumersColumns.PRIVATE_KEY_ID + " INT64, "
+            + CryptoConsumersColumns.ASCII_ARMOR + " INTEGER, "
+            + CryptoConsumersColumns.ENCRYPTION_ALGORITHM + " INTEGER, "
+            + CryptoConsumersColumns.HASH_ALORITHM + " INTEGER, "
+            + CryptoConsumersColumns.COMPRESSION + " INTEGER)";
 
     KeychainDatabase(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index a34cda0c3..5a86b0bdb 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -80,6 +80,7 @@ public class KeychainProvider extends ContentProvider {
 
     private static final int CRYPTO_CONSUMERS = 301;
     private static final int CRYPTO_CONSUMERS_BY_ROW_ID = 302;
+    private static final int CRYPTO_CONSUMERS_BY_PACKAGE_NAME = 303;
 
     // private static final int DATA_STREAM = 401;
 
@@ -230,6 +231,8 @@ public class KeychainProvider extends ContentProvider {
         matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS, CRYPTO_CONSUMERS);
         matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS + "/#",
                 CRYPTO_CONSUMERS_BY_ROW_ID);
+        matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS + "/"
+                + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", CRYPTO_CONSUMERS_BY_PACKAGE_NAME);
 
         /**
          * data stream
@@ -294,6 +297,7 @@ public class KeychainProvider extends ContentProvider {
             return CryptoConsumers.CONTENT_TYPE;
 
         case CRYPTO_CONSUMERS_BY_ROW_ID:
+        case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
             return CryptoConsumers.CONTENT_ITEM_TYPE;
 
         default:
@@ -607,6 +611,12 @@ public class KeychainProvider extends ContentProvider {
         case CRYPTO_CONSUMERS:
             qb.setTables(Tables.CRYPTO_CONSUMERS);
 
+            break;
+        case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
+            qb.setTables(Tables.CRYPTO_CONSUMERS);
+            qb.appendWhere(CryptoConsumers.PACKAGE_NAME + " = ");
+            qb.appendWhereEscapeString(uri.getPathSegments().get(2));
+
             break;
 
         default:
@@ -755,6 +765,7 @@ public class KeychainProvider extends ContentProvider {
                     selectionArgs);
             break;
         case CRYPTO_CONSUMERS_BY_ROW_ID:
+        case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
             count = db.delete(Tables.CRYPTO_CONSUMERS,
                     buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs);
             break;
@@ -818,6 +829,11 @@ public class KeychainProvider extends ContentProvider {
                 count = db.update(Tables.USER_IDS, values,
                         buildDefaultUserIdsSelection(uri, selection), selectionArgs);
                 break;
+            case CRYPTO_CONSUMERS_BY_ROW_ID:
+            case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
+                count = db.update(Tables.CRYPTO_CONSUMERS, values,
+                        buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs);
+                break;
             default:
                 throw new UnsupportedOperationException("Unknown uri: " + uri);
             }

From 202ccc2c36d191fbecdcc3098875dd075454c71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 1 Jul 2013 23:19:53 +0200
Subject: [PATCH 10/26] More work on crypto consumers

---
 .../openintents/crypto/ICryptoCallback.aidl   |  8 +-
 .../openintents/crypto/ICryptoService.aidl    |  8 +-
 .../demo/CryptoProviderDemoActivity.java      | 25 ++++--
 OpenPGP-Keychain/AndroidManifest.xml          |  4 +
 OpenPGP-Keychain/build.gradle                 |  2 +-
 .../res/layout/crypto_consumers_activity.xml  | 12 +++
 OpenPGP-Keychain/res/values/strings.xml       |  2 +
 .../openintents/crypto/ICryptoCallback.aidl   |  8 +-
 .../openintents/crypto/ICryptoService.aidl    |  8 +-
 .../org/sufficientlysecure/keychain/Id.java   |  1 +
 .../crypto_provider/CryptoService.java        |  9 +-
 .../keychain/ui/CryptoConsumersActivity.java  | 43 ++++++++++
 .../keychain/ui/CryptoConsumersFragment.java  | 85 +++++++++++++++++++
 .../keychain/ui/MainActivity.java             |  7 ++
 14 files changed, 205 insertions(+), 17 deletions(-)
 create mode 100644 OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java

diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl
index 80c741a9e..1f910d4c6 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoCallback.aidl
@@ -20,10 +20,12 @@ import org.openintents.crypto.CryptoSignatureResult;
 import org.openintents.crypto.CryptoError;
 
 interface ICryptoCallback {
-
-    oneway void onEncryptSignSuccess(in byte[] outputBytes);
     
-    oneway void onDecryptVerifySuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult);
+    /**
+     * CryptoSignatureResult is only returned if the Callback was used from decryptAndVerify
+     *
+     */
+    oneway void onSuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult);
 
 
     oneway void onError(in CryptoError error);
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
index 53f39dffc..c84ca28fb 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
@@ -71,6 +71,12 @@ interface ICryptoService {
      * @param callback
      *            Callback where to return results
      */
-    oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);    
+    oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);
+    
+    /**
+     * Opens setup using default parameters
+     *
+     */
+    oneway void setup(boolean asciiArmor, boolean newKeyring, String newKeyringUserId);
     
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
index 831c269e1..a82c44c6a 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -71,17 +71,28 @@ public class CryptoProviderDemoActivity extends Activity {
     /**
      * Callback from remote crypto service
      */
-    final ICryptoCallback.Stub callback = new ICryptoCallback.Stub() {
+    final ICryptoCallback.Stub encryptCallback = new ICryptoCallback.Stub() {
 
         @Override
-        public void onEncryptSignSuccess(byte[] outputBytes) throws RemoteException {
+        public void onSuccess(byte[] outputBytes, CryptoSignatureResult signatureResult)
+                throws RemoteException {
             Log.d(Constants.TAG, "onEncryptSignSuccess");
 
             // TODO
         }
 
         @Override
-        public void onDecryptVerifySuccess(byte[] outputBytes, CryptoSignatureResult signatureResult)
+        public void onError(CryptoError error) throws RemoteException {
+            Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId());
+            Log.e(Constants.TAG, "onError getMessage:" + error.getMessage());
+        }
+
+    };
+    
+    final ICryptoCallback.Stub decryptCallback = new ICryptoCallback.Stub() {
+
+        @Override
+        public void onSuccess(byte[] outputBytes, CryptoSignatureResult signatureResult)
                 throws RemoteException {
             Log.d(Constants.TAG, "onDecryptVerifySuccess");
 
@@ -101,7 +112,7 @@ public class CryptoProviderDemoActivity extends Activity {
 
         try {
             mCryptoServiceConnection.getService().encrypt(inputBytes,
-                    new String[] { mEncryptUserId.getText().toString() }, callback);
+                    new String[] { mEncryptUserId.getText().toString() }, encryptCallback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
@@ -112,7 +123,7 @@ public class CryptoProviderDemoActivity extends Activity {
 
         try {
             mCryptoServiceConnection.getService().sign(inputBytes,
-                    mSignUserId.getText().toString(), callback);
+                    mSignUserId.getText().toString(), encryptCallback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
@@ -124,7 +135,7 @@ public class CryptoProviderDemoActivity extends Activity {
         try {
             mCryptoServiceConnection.getService().encryptAndSign(inputBytes,
                     new String[] { mEncryptUserId.getText().toString() },
-                    mSignUserId.getText().toString(), callback);
+                    mSignUserId.getText().toString(), encryptCallback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
@@ -134,7 +145,7 @@ public class CryptoProviderDemoActivity extends Activity {
         byte[] inputBytes = mCiphertext.getText().toString().getBytes();
 
         try {
-            mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, callback);
+            mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, decryptCallback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 0f80604ef..d87e8ec0d 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -298,6 +298,10 @@
             android:name=".ui.PreferencesActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_preferences" />
+        <activity
+            android:name=".ui.CryptoConsumersActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_crypto_consumers" />
         <activity
             android:name=".ui.PreferencesKeyServerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index ec8e07cbd..2f3a0d81a 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.4.1'
+        classpath 'com.android.tools.build:gradle:0.4.+'
     }
 }
 
diff --git a/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml b/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
new file mode 100644
index 000000000..87a7c1739
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <fragment
+        android:id="@+id/crypto_consumers_list_fragment"
+        android:name="org.sufficientlysecure.keychain.ui.CryptoConsumersFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 5e3807a3a..835198af5 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="title_editKey">Edit Keyring</string>
     <string name="title_createKey">Create Keyring</string>
     <string name="title_preferences">Preferences</string>
+    <string name="title_crypto_consumers">Crypto Consumers</string>
     <string name="title_keyServerPreference">Key Server Preference</string>
     <string name="title_changePassPhrase">Change Passphrase</string>
     <string name="title_setPassPhrase">Set Passphrase</string>
@@ -89,6 +90,7 @@
     <string name="menu_managePublicKeys">Manage Public Keyrings</string>
     <string name="menu_manageSecretKeys">Manage Secret Keyrings</string>
     <string name="menu_preferences">Settings</string>
+    <string name="menu_crypto_consumers">Crypto Consumers</string>
     <string name="menu_importFromFile">Import from file</string>
     <string name="menu_importFromQrCode">Import from QR Code</string>
     <string name="menu_importFromNfc">Import from NFC</string>
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
index 80c741a9e..1f910d4c6 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
@@ -20,10 +20,12 @@ import org.openintents.crypto.CryptoSignatureResult;
 import org.openintents.crypto.CryptoError;
 
 interface ICryptoCallback {
-
-    oneway void onEncryptSignSuccess(in byte[] outputBytes);
     
-    oneway void onDecryptVerifySuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult);
+    /**
+     * CryptoSignatureResult is only returned if the Callback was used from decryptAndVerify
+     *
+     */
+    oneway void onSuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult);
 
 
     oneway void onError(in CryptoError error);
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
index 53f39dffc..c84ca28fb 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
@@ -71,6 +71,12 @@ interface ICryptoService {
      * @param callback
      *            Callback where to return results
      */
-    oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);    
+    oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);
+    
+    /**
+     * Opens setup using default parameters
+     *
+     */
+    oneway void setup(boolean asciiArmor, boolean newKeyring, String newKeyringUserId);
     
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java
index 382f144d7..b0d60cf94 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java
@@ -62,6 +62,7 @@ public final class Id {
             public static final int import_from_file = 0x21070020;
             public static final int import_from_qr_code = 0x21070021;
             public static final int import_from_nfc = 0x21070022;
+            public static final int crypto_consumers = 0x21070023;
         }
     }
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index 7ff8c0e3e..e601620ea 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -184,7 +184,7 @@ public class CryptoService extends Service {
                     signatureSuccess, signatureUnknown);
 
             // return over handler on client side
-            callback.onDecryptVerifySuccess(outputBytes, sigResult);
+            callback.onSuccess(outputBytes, sigResult);
         } catch (Exception e) {
             Log.e(Constants.TAG, "KeychainService, Exception!", e);
 
@@ -250,6 +250,13 @@ public class CryptoService extends Service {
             checkAndEnqueue(r);
         }
 
+        @Override
+        public void setup(boolean asciiArmor, boolean newKeyring, String newKeyringUserId)
+                throws RemoteException {
+            // TODO Auto-generated method stub
+            
+        }
+
     };
 
     private final IServiceActivityCallback.Stub mBinderServiceActivity = new IServiceActivityCallback.Stub() {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java
new file mode 100644
index 000000000..59eaa063f
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java
@@ -0,0 +1,43 @@
+package org.sufficientlysecure.keychain.ui;
+
+import org.sufficientlysecure.keychain.R;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.MenuItem;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+public class CryptoConsumersActivity extends SherlockFragmentActivity {
+    private ActionBar mActionBar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mActionBar = getSupportActionBar();
+
+        setContentView(R.layout.crypto_consumers_activity);
+
+        mActionBar.setDisplayShowTitleEnabled(true);
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    /**
+     * Menu Options
+     */
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case android.R.id.home:
+            // app icon in Action Bar clicked; go home
+            Intent intent = new Intent(this, MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            return true;
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java
new file mode 100644
index 000000000..8ecc5ced1
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java
@@ -0,0 +1,85 @@
+package org.sufficientlysecure.keychain.ui;
+
+import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
+import org.sufficientlysecure.keychain.util.Log;
+
+import com.actionbarsherlock.app.SherlockListFragment;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.CursorLoader;
+import android.support.v4.content.Loader;
+import android.support.v4.widget.SimpleCursorAdapter;
+
+import android.view.View;
+import android.widget.ListView;
+
+public class CryptoConsumersFragment extends SherlockListFragment implements
+        LoaderManager.LoaderCallbacks<Cursor> {
+
+    // This is the Adapter being used to display the list's data.
+    SimpleCursorAdapter mAdapter;
+
+    // If non-null, this is the current filter the user has provided.
+    String mCurFilter;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        // Give some text to display if there is no data. In a real
+        // application this would come from a resource.
+        setEmptyText("TODO no crypto consumers");
+
+        // We have a menu item to show in action bar.
+        setHasOptionsMenu(true);
+
+        // Create an empty adapter we will use to display the loaded data.
+        mAdapter = new SimpleCursorAdapter(getActivity(), android.R.layout.simple_list_item_2,
+                null, new String[] { CryptoConsumers.PACKAGE_NAME, CryptoConsumers.PACKAGE_NAME },
+                new int[] { android.R.id.text1, android.R.id.text2 }, 0);
+        setListAdapter(mAdapter);
+
+        // Prepare the loader. Either re-connect with an existing one,
+        // or start a new one.
+        getLoaderManager().initLoader(0, null, this);
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        // Insert desired behavior here.
+        Log.i("FragmentComplexList", "Item clicked: " + id);
+    }
+
+    // These are the Contacts rows that we will retrieve.
+    static final String[] CONSUMERS_SUMMARY_PROJECTION = new String[] { CryptoConsumers._ID,
+            CryptoConsumers.PACKAGE_NAME };
+
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        // This is called when a new Loader needs to be created. This
+        // sample only has one Loader, so we don't care about the ID.
+        // First, pick the base URI to use depending on whether we are
+        // currently filtering.
+        Uri baseUri = CryptoConsumers.CONTENT_URI;
+
+        // Now create and return a CursorLoader that will take care of
+        // creating a Cursor for the data being displayed.
+        return new CursorLoader(getActivity(), baseUri, CONSUMERS_SUMMARY_PROJECTION, null, null,
+                CryptoConsumers.PACKAGE_NAME + " COLLATE LOCALIZED ASC");
+    }
+
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        // Swap the new cursor in. (The framework will take care of closing the
+        // old cursor once we return.)
+        mAdapter.swapCursor(data);
+    }
+
+    public void onLoaderReset(Loader<Cursor> loader) {
+        // This is called when the last Cursor provided to onLoadFinished()
+        // above is about to be closed. We need to make sure we are no
+        // longer using it.
+        mAdapter.swapCursor(null);
+    }
+
+}
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
index 447801e55..a108b3db4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -80,6 +80,9 @@ public class MainActivity extends SherlockActivity {
         menu.add(0, Id.menu.option.preferences, 0, R.string.menu_preferences)
                 .setIcon(R.drawable.ic_menu_settings)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(0, Id.menu.option.crypto_consumers, 0, R.string.menu_crypto_consumers)
+                .setIcon(R.drawable.ic_menu_settings)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         return true;
     }
 
@@ -91,6 +94,10 @@ public class MainActivity extends SherlockActivity {
             startActivity(new Intent(this, PreferencesActivity.class));
             return true;
 
+        case Id.menu.option.crypto_consumers:
+            startActivity(new Intent(this, CryptoConsumersActivity.class));
+            return true;
+
         default:
             break;
 

From 14350679d1ef17fe1add86b1ec1def99f9a8f0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 1 Jul 2013 23:23:53 +0200
Subject: [PATCH 11/26] Restructure

---
 OpenPGP-Keychain/AndroidManifest.xml             | 16 ++++++++--------
 .../res/layout/crypto_consumers_activity.xml     |  2 +-
 .../CryptoConsumersActivity.java                 |  3 ++-
 .../CryptoConsumersFragment.java                 |  2 +-
 .../CryptoService.java                           |  3 ++-
 .../IServiceActivityCallback.aidl                |  2 +-
 .../ServiceActivity.java                         |  3 ++-
 .../keychain/ui/MainActivity.java                |  1 +
 8 files changed, 18 insertions(+), 14 deletions(-)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/{ui => remote_api}/CryptoConsumersActivity.java (91%)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/{ui => remote_api}/CryptoConsumersFragment.java (98%)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/{crypto_provider => remote_api}/CryptoService.java (99%)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/{crypto_provider => remote_api}/IServiceActivityCallback.aidl (93%)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/{crypto_provider => remote_api}/ServiceActivity.java (98%)

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index d87e8ec0d..f011e6929 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -298,10 +298,6 @@
             android:name=".ui.PreferencesActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_preferences" />
-        <activity
-            android:name=".ui.CryptoConsumersActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_crypto_consumers" />
         <activity
             android:name=".ui.PreferencesKeyServerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -460,21 +456,25 @@
             android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider"
             android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
 
-        <!-- Crypto Provider internal intents -->
+        <!-- Remote API internal intents -->
 
         <activity
-            android:name=".crypto_provider.ServiceActivity"
+            android:name="org.sufficientlysecure.keychain.remote_api.ServiceActivity"
             android:exported="false"
             android:label="TODO crypto activity"
             android:process=":crypto" >
 
             <!-- Don't publish intents, they are only used internally! -->
         </activity>
+        <activity
+            android:name="org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_crypto_consumers" />
 
-        <!-- Crypto Provider API -->
+        <!-- Remote API -->
 
         <service
-            android:name="org.sufficientlysecure.keychain.crypto_provider.CryptoService"
+            android:name="org.sufficientlysecure.keychain.remote_api.CryptoService"
             android:enabled="true"
             android:exported="true"
             android:process=":crypto" >
diff --git a/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml b/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
index 87a7c1739..b314173eb 100644
--- a/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
+++ b/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
@@ -5,7 +5,7 @@
 
     <fragment
         android:id="@+id/crypto_consumers_list_fragment"
-        android:name="org.sufficientlysecure.keychain.ui.CryptoConsumersFragment"
+        android:name="org.sufficientlysecure.keychain.remote_api.CryptoConsumersFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
similarity index 91%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
index 59eaa063f..e3aa0ed49 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
@@ -1,6 +1,7 @@
-package org.sufficientlysecure.keychain.ui;
+package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.MainActivity;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
similarity index 98%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
index 8ecc5ced1..935d64560 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.ui;
+package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
 import org.sufficientlysecure.keychain.util.Log;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
similarity index 99%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
index e601620ea..c7d40d376 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.sufficientlysecure.keychain.crypto_provider;
+package org.sufficientlysecure.keychain.remote_api;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.util.PausableThreadPoolExecutor;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
similarity index 93%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
index 61a8da06c..871560cc8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.sufficientlysecure.keychain.crypto_provider;
+package org.sufficientlysecure.keychain.remote_api;
 
 
 interface IServiceActivityCallback {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
similarity index 98%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 7efce85c7..055de9be1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.sufficientlysecure.keychain.crypto_provider;
+package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
 import org.sufficientlysecure.keychain.helper.PgpMain;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
index a108b3db4..434db7a29 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui;
 
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;

From 7cca7b1ffa416a354c08e1cb6b5776ae55fc19ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 25 Jul 2013 16:25:20 +0200
Subject: [PATCH 12/26] Redifine Service callbacks

---
 ....xml => crypto_consumer_list_activity.xml} |   0
 .../crypto_consumer_register_activity.xml     | 102 ++++++++++++++++++
 OpenPGP-Keychain/res/layout/decrypt.xml       |   1 -
 .../register_crypto_consumer_activity.xml     |  25 -----
 .../remote_api/CryptoConsumersActivity.java   |   2 +-
 .../keychain/remote_api/CryptoService.java    |   6 +-
 .../remote_api/IServiceActivityCallback.aidl  |   8 +-
 .../keychain/remote_api/ServiceActivity.java  |  50 +++++++--
 8 files changed, 147 insertions(+), 47 deletions(-)
 rename OpenPGP-Keychain/res/layout/{crypto_consumers_activity.xml => crypto_consumer_list_activity.xml} (100%)
 create mode 100644 OpenPGP-Keychain/res/layout/crypto_consumer_register_activity.xml
 delete mode 100644 OpenPGP-Keychain/res/layout/register_crypto_consumer_activity.xml

diff --git a/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml b/OpenPGP-Keychain/res/layout/crypto_consumer_list_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
rename to OpenPGP-Keychain/res/layout/crypto_consumer_list_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/crypto_consumer_register_activity.xml b/OpenPGP-Keychain/res/layout/crypto_consumer_register_activity.xml
new file mode 100644
index 000000000..3af373956
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/crypto_consumer_register_activity.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="3dip" >
+
+        <TextView
+            android:id="@+id/register_crypto_consumer_select_key"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:text="Select key"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <Button
+            android:id="@+id/register_crypto_consumer_select_key_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="TD Select priv key" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <CheckBox
+            android:id="@+id/asciiArmour"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/label_asciiArmour" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/register_crypto_consumer_register_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="3dip" >
+
+        <TextView
+            android:id="@+id/register_crypto_consumer_question"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Package TODO requests permanent access to OpenPGP Keychain\&apos;s API. Allow permanent access?"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <LinearLayout
+            android:id="@+id/register_crypto_consumer_register_layout"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingBottom="3dip" >
+
+            <Button
+                android:id="@+id/register_crypto_consumer_disallow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Disallow access" />
+
+            <Button
+                android:id="@+id/register_crypto_consumer_allow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Allow access" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/register_crypto_consumer_edit_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="3dip" >
+
+        <Button
+            android:id="@+id/register_crypto_consumer_disallow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Revoke access" />
+
+        <Button
+            android:id="@+id/register_crypto_consumer_allow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Save" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt.xml
index 4901536ae..84f1fc298 100644
--- a/OpenPGP-Keychain/res/layout/decrypt.xml
+++ b/OpenPGP-Keychain/res/layout/decrypt.xml
@@ -22,7 +22,6 @@
     android:orientation="vertical" >
 
     <ScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true" >
diff --git a/OpenPGP-Keychain/res/layout/register_crypto_consumer_activity.xml b/OpenPGP-Keychain/res/layout/register_crypto_consumer_activity.xml
deleted file mode 100644
index 24a64f1ac..000000000
--- a/OpenPGP-Keychain/res/layout/register_crypto_consumer_activity.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Register?" />
-
-    <Button
-        android:id="@+id/register_crypto_consumer_allow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Allow access" />
-
-    <Button
-        android:id="@+id/register_crypto_consumer_disallow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Disallow" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
index e3aa0ed49..3f12a5e8b 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
@@ -19,7 +19,7 @@ public class CryptoConsumersActivity extends SherlockFragmentActivity {
 
         mActionBar = getSupportActionBar();
 
-        setContentView(R.layout.crypto_consumers_activity);
+        setContentView(R.layout.crypto_consumer_list_activity);
 
         mActionBar.setDisplayShowTitleEnabled(true);
         mActionBar.setDisplayHomeAsUpEnabled(true);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
index c7d40d376..71b78ee01 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
@@ -263,7 +263,7 @@ public class CryptoService extends Service {
     private final IServiceActivityCallback.Stub mBinderServiceActivity = new IServiceActivityCallback.Stub() {
 
         @Override
-        public void register(boolean success, String packageName) throws RemoteException {
+        public void onRegistered(boolean success, String packageName) throws RemoteException {
 
             if (success) {
                 // resume threads
@@ -280,7 +280,7 @@ public class CryptoService extends Service {
         }
 
         @Override
-        public void cachePassphrase(boolean success, String passphrase) throws RemoteException {
+        public void onCachedPassphrase(boolean success) throws RemoteException {
 
         }
 
@@ -355,8 +355,6 @@ public class CryptoService extends Service {
         Log.d(Constants.TAG, "starting activity...");
         Intent intent = new Intent(getBaseContext(), ServiceActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        // intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        // intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         intent.setAction(action);
         if (extras != null) {
             intent.putExtras(extras);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
index 871560cc8..e9949e1ae 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
@@ -19,10 +19,8 @@ package org.sufficientlysecure.keychain.remote_api;
 
 interface IServiceActivityCallback {
     
+    oneway void onRegistered(in boolean success, in String packageName);
     
-    oneway void register(in boolean success, in String packageName);
-    
-    oneway void cachePassphrase(in boolean success, in String passphrase);
-    
-    
+    oneway void onCachedPassphrase(in boolean success);
+
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 055de9be1..981568944 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -16,6 +16,8 @@
 
 package org.sufficientlysecure.keychain.remote_api;
 
+import java.util.ArrayList;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
@@ -35,30 +37,32 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.RemoteException;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.LinearLayout;
 
 public class ServiceActivity extends SherlockFragmentActivity {
 
-    public static final String ACTION_REGISTER = "org.sufficientlysecure.keychain.REGISTER";
-    public static final String ACTION_CACHE_PASSPHRASE = "org.sufficientlysecure.keychain.CRYPTO_CACHE_PASSPHRASE";
+    public static final String ACTION_REGISTER = "org.sufficientlysecure.keychain.remote_api.REGISTER";
+    public static final String ACTION_CACHE_PASSPHRASE = "org.sufficientlysecure.keychain.remote_api.CRYPTO_CACHE_PASSPHRASE";
 
     public static final String EXTRA_SECRET_KEY_ID = "secretKeyId";
     public static final String EXTRA_PACKAGE_NAME = "packageName";
 
-    private IServiceActivityCallback mService;
+    private IServiceActivityCallback mServiceCallback;
     private boolean mServiceBound;
 
     private ServiceConnection mServiceActivityConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName name, IBinder service) {
-            mService = IServiceActivityCallback.Stub.asInterface(service);
+            mServiceCallback = IServiceActivityCallback.Stub.asInterface(service);
             Log.d(Constants.TAG, "connected to ICryptoServiceActivity");
             mServiceBound = true;
         }
 
         public void onServiceDisconnected(ComponentName name) {
-            mService = null;
+            mServiceCallback = null;
             Log.d(Constants.TAG, "disconnected from ICryptoServiceActivity");
             mServiceBound = false;
         }
@@ -70,7 +74,7 @@ public class ServiceActivity extends SherlockFragmentActivity {
      * @return
      */
     public boolean bindToService() {
-        if (mService == null && !mServiceBound) { // if not already connected
+        if (mServiceCallback == null && !mServiceBound) { // if not already connected
             try {
                 Log.d(Constants.TAG, "not bound yet");
 
@@ -129,7 +133,20 @@ public class ServiceActivity extends SherlockFragmentActivity {
         if (ACTION_REGISTER.equals(action)) {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
 
-            setContentView(R.layout.register_crypto_consumer_activity);
+            setContentView(R.layout.crypto_consumer_register_activity);
+            LinearLayout layoutRegister = (LinearLayout) findViewById(R.id.register_crypto_consumer_register_layout);
+            LinearLayout layoutEdit = (LinearLayout) findViewById(R.id.register_crypto_consumer_edit_layout);
+
+            // if already registered show edit buttons
+            ArrayList<String> allowedPkgs = ProviderHelper.getCryptoConsumers(this);
+            if (allowedPkgs.contains(packageName)) {
+                Log.d(Constants.TAG, "Package is allowed! packageName: " + packageName);
+                layoutRegister.setVisibility(View.GONE);
+                layoutEdit.setVisibility(View.VISIBLE);
+            } else {
+                layoutRegister.setVisibility(View.VISIBLE);
+                layoutEdit.setVisibility(View.GONE);
+            }
 
             Button allowButton = (Button) findViewById(R.id.register_crypto_consumer_allow);
             Button disallowButton = (Button) findViewById(R.id.register_crypto_consumer_disallow);
@@ -141,7 +158,11 @@ public class ServiceActivity extends SherlockFragmentActivity {
                     ProviderHelper.addCryptoConsumer(ServiceActivity.this, packageName);
                     // Intent data = new Intent();
 
-                    setResult(RESULT_OK);
+                    try {
+                        mServiceCallback.onRegistered(true, packageName);
+                    } catch (RemoteException e) {
+                        Log.e(Constants.TAG, "ServiceActivity");
+                    }
                     finish();
                 }
             });
@@ -150,7 +171,11 @@ public class ServiceActivity extends SherlockFragmentActivity {
 
                 @Override
                 public void onClick(View v) {
-                    setResult(RESULT_CANCELED);
+                    try {
+                        mServiceCallback.onRegistered(false, packageName);
+                    } catch (RemoteException e) {
+                        Log.e(Constants.TAG, "ServiceActivity");
+                    }
                     finish();
                 }
             });
@@ -160,7 +185,6 @@ public class ServiceActivity extends SherlockFragmentActivity {
             showPassphraseDialog(secretKeyId);
         } else {
             Log.e(Constants.TAG, "Wrong action!");
-            setResult(RESULT_CANCELED);
             finish();
         }
     }
@@ -176,7 +200,11 @@ public class ServiceActivity extends SherlockFragmentActivity {
             @Override
             public void handleMessage(Message message) {
                 if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
-                    setResult(RESULT_OK);
+                    try {
+                        mServiceCallback.onCachedPassphrase(true);
+                    } catch (RemoteException e) {
+                        Log.e(Constants.TAG, "ServiceActivity");
+                    }
                     finish();
                 }
             }

From c3b49a318f82238245f6c40b7a8abda01cb9433d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Sep 2013 20:12:58 +0200
Subject: [PATCH 13/26] Show app name in registered apps

---
 OpenPGP-Keychain/AndroidManifest.xml          |   3 +-
 ...xml => api_app_settings_list_activity.xml} |   2 +-
 ...activity.xml => api_register_activity.xml} |   0
 OpenPGP-Keychain/res/values/strings.xml       |  10 ++-
 .../remote_api/RegisteredAppsAdapter.java     |  72 ++++++++++++++++++
 ...gment.java => RegisteredAppsFragment.java} |  14 ++--
 ...y.java => RegisteredAppsListActivity.java} |   4 +-
 .../keychain/remote_api/ServiceActivity.java  |   2 +-
 .../ui/.SelectSecretKeyFragment.java.kate-swp | Bin 0 -> 64 bytes
 .../keychain/ui/MainActivity.java             |   6 +-
 10 files changed, 94 insertions(+), 19 deletions(-)
 rename OpenPGP-Keychain/res/layout/{crypto_consumer_list_activity.xml => api_app_settings_list_activity.xml} (94%)
 rename OpenPGP-Keychain/res/layout/{crypto_consumer_register_activity.xml => api_register_activity.xml} (100%)
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/{CryptoConsumersFragment.java => RegisteredAppsFragment.java} (85%)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/{CryptoConsumersActivity.java => RegisteredAppsListActivity.java} (89%)
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/.SelectSecretKeyFragment.java.kate-swp

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index f011e6929..69abb39d9 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -253,6 +253,7 @@
                 <data android:scheme="file" />
                 <data android:scheme="content" />
                 <data android:mimeType="*/*" />
+                <!-- Workaround to match files in pathes with dots in them, like /cdcard/my.folder/test.gpg -->
                 <data android:pathPattern=".*\\.gpg" />
                 <data android:pathPattern=".*\\..*\\.gpg" />
                 <data android:pathPattern=".*\\..*\\..*\\.gpg" />
@@ -467,7 +468,7 @@
             <!-- Don't publish intents, they are only used internally! -->
         </activity>
         <activity
-            android:name="org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity"
+            android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_crypto_consumers" />
 
diff --git a/OpenPGP-Keychain/res/layout/crypto_consumer_list_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml
similarity index 94%
rename from OpenPGP-Keychain/res/layout/crypto_consumer_list_activity.xml
rename to OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml
index b314173eb..a926ad1a8 100644
--- a/OpenPGP-Keychain/res/layout/crypto_consumer_list_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml
@@ -5,7 +5,7 @@
 
     <fragment
         android:id="@+id/crypto_consumers_list_fragment"
-        android:name="org.sufficientlysecure.keychain.remote_api.CryptoConsumersFragment"
+        android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/OpenPGP-Keychain/res/layout/crypto_consumer_register_activity.xml b/OpenPGP-Keychain/res/layout/api_register_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/crypto_consumer_register_activity.xml
rename to OpenPGP-Keychain/res/layout/api_register_activity.xml
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 835198af5..5dfd0d312 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -31,7 +31,7 @@
     <string name="title_editKey">Edit Keyring</string>
     <string name="title_createKey">Create Keyring</string>
     <string name="title_preferences">Preferences</string>
-    <string name="title_crypto_consumers">Crypto Consumers</string>
+    <string name="title_crypto_consumers">Registered Applications</string>
     <string name="title_keyServerPreference">Key Server Preference</string>
     <string name="title_changePassPhrase">Change Passphrase</string>
     <string name="title_setPassPhrase">Set Passphrase</string>
@@ -90,7 +90,7 @@
     <string name="menu_managePublicKeys">Manage Public Keyrings</string>
     <string name="menu_manageSecretKeys">Manage Secret Keyrings</string>
     <string name="menu_preferences">Settings</string>
-    <string name="menu_crypto_consumers">Crypto Consumers</string>
+    <string name="menu_apiAppSettings">Registered Apps</string>
     <string name="menu_importFromFile">Import from file</string>
     <string name="menu_importFromQrCode">Import from QR Code</string>
     <string name="menu_importFromNfc">Import from NFC</string>
@@ -359,5 +359,9 @@
     <string name="intent_import_key">OpenPGP: Import Keyring</string>
     <string name="intent_send_encrypt">OpenPGP: Encrypt</string>
     <string name="intent_send_decrypt">OpenPGP: Decrypt</string>
-
+    
+    <!-- Remote API -->
+    <string name="api_no_apps">No registered applications!</string>
+    <string name="api_unknown_app">Unknown app</string>
+    
 </resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
new file mode 100644
index 000000000..61888ad5a
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.keychain.remote_api;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.database.Cursor;
+import android.support.v4.widget.CursorAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+public class RegisteredAppsAdapter extends CursorAdapter {
+
+    private LayoutInflater mInflater;
+    private PackageManager pm;
+
+    @SuppressWarnings("deprecation")
+    public RegisteredAppsAdapter(Context context, Cursor c) {
+        super(context, c);
+
+        mInflater = LayoutInflater.from(context);
+        pm = context.getApplicationContext().getPackageManager();
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        TextView text1 = (TextView) view.findViewById(android.R.id.text1);
+        TextView text2 = (TextView) view.findViewById(android.R.id.text2);
+
+        String packageName = cursor.getString(cursor.getColumnIndex(CryptoConsumers.PACKAGE_NAME));
+        if (packageName != null) {
+            text2.setText(packageName);
+
+            // get application name
+            try {
+                ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+
+                text1.setText(pm.getApplicationLabel(ai));
+            } catch (final NameNotFoundException e) {
+                text1.setText(R.string.api_unknown_app);
+            }
+        }
+
+    }
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        return mInflater.inflate(android.R.layout.simple_list_item_2, null);
+    }
+
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsFragment.java
similarity index 85%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsFragment.java
index 935d64560..b8fd649b4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsFragment.java
@@ -1,25 +1,25 @@
 package org.sufficientlysecure.keychain.remote_api;
 
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
 import org.sufficientlysecure.keychain.util.Log;
 
 import com.actionbarsherlock.app.SherlockListFragment;
+
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
-import android.support.v4.widget.SimpleCursorAdapter;
-
 import android.view.View;
 import android.widget.ListView;
 
-public class CryptoConsumersFragment extends SherlockListFragment implements
+public class RegisteredAppsFragment extends SherlockListFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
     // This is the Adapter being used to display the list's data.
-    SimpleCursorAdapter mAdapter;
+    RegisteredAppsAdapter mAdapter;
 
     // If non-null, this is the current filter the user has provided.
     String mCurFilter;
@@ -30,15 +30,13 @@ public class CryptoConsumersFragment extends SherlockListFragment implements
 
         // Give some text to display if there is no data. In a real
         // application this would come from a resource.
-        setEmptyText("TODO no crypto consumers");
+        setEmptyText(getString(R.string.api_no_apps));
 
         // We have a menu item to show in action bar.
         setHasOptionsMenu(true);
 
         // Create an empty adapter we will use to display the loaded data.
-        mAdapter = new SimpleCursorAdapter(getActivity(), android.R.layout.simple_list_item_2,
-                null, new String[] { CryptoConsumers.PACKAGE_NAME, CryptoConsumers.PACKAGE_NAME },
-                new int[] { android.R.id.text1, android.R.id.text2 }, 0);
+        mAdapter = new RegisteredAppsAdapter(getActivity(), null);
         setListAdapter(mAdapter);
 
         // Prepare the loader. Either re-connect with an existing one,
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
similarity index 89%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
index 3f12a5e8b..bf34e14f4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
@@ -10,7 +10,7 @@ import com.actionbarsherlock.view.MenuItem;
 import android.content.Intent;
 import android.os.Bundle;
 
-public class CryptoConsumersActivity extends SherlockFragmentActivity {
+public class RegisteredAppsListActivity extends SherlockFragmentActivity {
     private ActionBar mActionBar;
 
     @Override
@@ -19,7 +19,7 @@ public class CryptoConsumersActivity extends SherlockFragmentActivity {
 
         mActionBar = getSupportActionBar();
 
-        setContentView(R.layout.crypto_consumer_list_activity);
+        setContentView(R.layout.api_app_settings_list_activity);
 
         mActionBar.setDisplayShowTitleEnabled(true);
         mActionBar.setDisplayHomeAsUpEnabled(true);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 981568944..ba09c9f56 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -133,7 +133,7 @@ public class ServiceActivity extends SherlockFragmentActivity {
         if (ACTION_REGISTER.equals(action)) {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
 
-            setContentView(R.layout.crypto_consumer_register_activity);
+            setContentView(R.layout.api_register_activity);
             LinearLayout layoutRegister = (LinearLayout) findViewById(R.id.register_crypto_consumer_register_layout);
             LinearLayout layoutEdit = (LinearLayout) findViewById(R.id.register_crypto_consumer_edit_layout);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/.SelectSecretKeyFragment.java.kate-swp b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/.SelectSecretKeyFragment.java.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..c72aa8947f5cb9446d7e88e429f5170b6d5130c8
GIT binary patch
literal 64
zcmZQzV36@nEJ;-eE>A2_aLdd|RnS!kOD!tS%+FIW)H4Y7WME)m1Y$QJW>Qda4GuyQ
H@NfkH*Y*qI

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
index 434db7a29..3f5ca536f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.ui;
 
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity;
+import org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;
@@ -81,7 +81,7 @@ public class MainActivity extends SherlockActivity {
         menu.add(0, Id.menu.option.preferences, 0, R.string.menu_preferences)
                 .setIcon(R.drawable.ic_menu_settings)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(0, Id.menu.option.crypto_consumers, 0, R.string.menu_crypto_consumers)
+        menu.add(0, Id.menu.option.crypto_consumers, 0, R.string.menu_apiAppSettings)
                 .setIcon(R.drawable.ic_menu_settings)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         return true;
@@ -96,7 +96,7 @@ public class MainActivity extends SherlockActivity {
             return true;
 
         case Id.menu.option.crypto_consumers:
-            startActivity(new Intent(this, CryptoConsumersActivity.class));
+            startActivity(new Intent(this, RegisteredAppsListActivity.class));
             return true;
 
         default:

From d8bd6e29461d30a8638831451b781b8efa7e4a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Sep 2013 22:04:27 +0200
Subject: [PATCH 14/26] Settings fragment and activity for apps

---
 OpenPGP-Keychain/AndroidManifest.xml          |   5 +
 .../res/layout/api_app_register_activity.xml  |  53 +++++++++
 .../res/layout/api_app_settings_activity.xml  |  37 +++++++
 .../res/layout/api_app_settings_fragment.xml  |  50 +++++++++
 ...ctivity.xml => api_apps_list_activity.xml} |   2 +-
 .../res/layout/api_register_activity.xml      | 102 ------------------
 .../remote_api/AppSettingsActivity.java       |  35 ++++++
 .../remote_api/AppSettingsFragment.java       |  20 ++++
 .../RegisteredAppsListActivity.java           |   2 +-
 ...t.java => RegisteredAppsListFragment.java} |  25 +++--
 .../keychain/remote_api/ServiceActivity.java  |   2 +-
 11 files changed, 220 insertions(+), 113 deletions(-)
 create mode 100644 OpenPGP-Keychain/res/layout/api_app_register_activity.xml
 create mode 100644 OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
 create mode 100644 OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
 rename OpenPGP-Keychain/res/layout/{api_app_settings_list_activity.xml => api_apps_list_activity.xml} (93%)
 delete mode 100644 OpenPGP-Keychain/res/layout/api_register_activity.xml
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/{RegisteredAppsFragment.java => RegisteredAppsListFragment.java} (77%)

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 69abb39d9..2509e1760 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -470,7 +470,12 @@
         <activity
             android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:exported="false"
             android:label="@string/title_crypto_consumers" />
+        <activity
+            android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:exported="false" />
 
         <!-- Remote API -->
 
diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
new file mode 100644
index 000000000..b8b668681
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <fragment
+        android:id="@+id/api_app_settings_fragment"
+        android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:layout="@layout/api_app_settings_fragment" />
+
+    <LinearLayout
+        android:id="@+id/register_crypto_consumer_register_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="3dip" >
+
+        <TextView
+            android:id="@+id/register_crypto_consumer_question"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Package TODO requests permanent access to OpenPGP Keychain\&apos;s API. Allow permanent access?"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <LinearLayout
+            android:id="@+id/register_crypto_consumer_register_layout"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingBottom="3dip" >
+
+            <Button
+                android:id="@+id/register_crypto_consumer_disallow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Disallow access" />
+
+            <Button
+                android:id="@+id/register_crypto_consumer_allow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Allow access" />
+        </LinearLayout>
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
new file mode 100644
index 000000000..e25a110cc
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <fragment
+        android:id="@+id/api_app_settings_fragment"
+        android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:layout="@layout/api_app_settings_fragment" />
+
+    <LinearLayout
+        android:id="@+id/register_crypto_consumer_edit_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="3dip" >
+
+        <Button
+            android:id="@+id/register_crypto_consumer_disallow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Revoke access" />
+
+        <Button
+            android:id="@+id/register_crypto_consumer_allow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Save" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
new file mode 100644
index 000000000..3763d3198
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="3dip" >
+
+        <TextView
+            android:id="@+id/register_crypto_consumer_select_key"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:text="Select key"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <Button
+            android:id="@+id/register_crypto_consumer_select_key_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="TD Select priv key" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/api_app_settings_advanced_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="show advanced settings" />
+
+    <LinearLayout
+        android:id="@+id/api_app_settings_advanced"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <CheckBox
+            android:id="@+id/asciiArmour"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/label_asciiArmour" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
similarity index 93%
rename from OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml
rename to OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
index a926ad1a8..e4657c107 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
@@ -5,7 +5,7 @@
 
     <fragment
         android:id="@+id/crypto_consumers_list_fragment"
-        android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsFragment"
+        android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/OpenPGP-Keychain/res/layout/api_register_activity.xml b/OpenPGP-Keychain/res/layout/api_register_activity.xml
deleted file mode 100644
index 3af373956..000000000
--- a/OpenPGP-Keychain/res/layout/api_register_activity.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="3dip" >
-
-        <TextView
-            android:id="@+id/register_crypto_consumer_select_key"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:text="Select key"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <Button
-            android:id="@+id/register_crypto_consumer_select_key_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="TD Select priv key" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <CheckBox
-            android:id="@+id/asciiArmour"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="@string/label_asciiArmour" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/register_crypto_consumer_register_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="3dip" >
-
-        <TextView
-            android:id="@+id/register_crypto_consumer_question"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Package TODO requests permanent access to OpenPGP Keychain\&apos;s API. Allow permanent access?"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <LinearLayout
-            android:id="@+id/register_crypto_consumer_register_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingBottom="3dip" >
-
-            <Button
-                android:id="@+id/register_crypto_consumer_disallow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Disallow access" />
-
-            <Button
-                android:id="@+id/register_crypto_consumer_allow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Allow access" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/register_crypto_consumer_edit_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="3dip" >
-
-        <Button
-            android:id="@+id/register_crypto_consumer_disallow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Revoke access" />
-
-        <Button
-            android:id="@+id/register_crypto_consumer_allow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Save" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
new file mode 100644
index 000000000..31fbdc8a6
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -0,0 +1,35 @@
+package org.sufficientlysecure.keychain.remote_api;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.util.Log;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+public class AppSettingsActivity extends SherlockFragmentActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.api_app_settings_activity);
+
+        // check if add new or edit existing
+        Intent intent = getIntent();
+        Uri appUri = intent.getData();
+        if (appUri == null) {
+            Log.e(Constants.TAG, "Intent data missing. Should be Uri of app!");
+            finish();
+            return;
+        }
+
+        Log.d(Constants.TAG, "uri: " + appUri);
+        
+        
+    }
+
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
new file mode 100644
index 000000000..4bb09d50f
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
@@ -0,0 +1,20 @@
+package org.sufficientlysecure.keychain.remote_api;
+
+import org.sufficientlysecure.keychain.R;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class AppSettingsFragment extends Fragment {
+    
+    /**
+     * Inflate the layout for this fragment
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.api_app_settings_fragment, container, false);
+    }
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
index bf34e14f4..f5487e2a3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
@@ -19,7 +19,7 @@ public class RegisteredAppsListActivity extends SherlockFragmentActivity {
 
         mActionBar = getSupportActionBar();
 
-        setContentView(R.layout.api_app_settings_list_activity);
+        setContentView(R.layout.api_apps_list_activity);
 
         mActionBar.setDisplayShowTitleEnabled(true);
         mActionBar.setDisplayHomeAsUpEnabled(true);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
similarity index 77%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsFragment.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
index b8fd649b4..52f4d1398 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
@@ -1,11 +1,13 @@
 package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
-import org.sufficientlysecure.keychain.util.Log;
 
 import com.actionbarsherlock.app.SherlockListFragment;
 
+import android.content.ContentUris;
+import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -13,9 +15,11 @@ import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-public class RegisteredAppsFragment extends SherlockListFragment implements
+public class RegisteredAppsListFragment extends SherlockListFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
     // This is the Adapter being used to display the list's data.
@@ -28,6 +32,17 @@ public class RegisteredAppsFragment extends SherlockListFragment implements
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        getListView().setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
+                // edit app settings
+                Intent intent = new Intent(getActivity(), AppSettingsActivity.class);
+                intent.setData(ContentUris.withAppendedId(
+                        KeychainContract.CryptoConsumers.CONTENT_URI, id));
+                startActivity(intent);
+            }
+        });
+
         // Give some text to display if there is no data. In a real
         // application this would come from a resource.
         setEmptyText(getString(R.string.api_no_apps));
@@ -44,12 +59,6 @@ public class RegisteredAppsFragment extends SherlockListFragment implements
         getLoaderManager().initLoader(0, null, this);
     }
 
-    @Override
-    public void onListItemClick(ListView l, View v, int position, long id) {
-        // Insert desired behavior here.
-        Log.i("FragmentComplexList", "Item clicked: " + id);
-    }
-
     // These are the Contacts rows that we will retrieve.
     static final String[] CONSUMERS_SUMMARY_PROJECTION = new String[] { CryptoConsumers._ID,
             CryptoConsumers.PACKAGE_NAME };
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index ba09c9f56..5849fb80d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -133,7 +133,7 @@ public class ServiceActivity extends SherlockFragmentActivity {
         if (ACTION_REGISTER.equals(action)) {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
 
-            setContentView(R.layout.api_register_activity);
+            setContentView(R.layout.api_app_settings_activity);
             LinearLayout layoutRegister = (LinearLayout) findViewById(R.id.register_crypto_consumer_register_layout);
             LinearLayout layoutEdit = (LinearLayout) findViewById(R.id.register_crypto_consumer_edit_layout);
 

From fcec7e830c11fa0bda903ea9913fa2e41fa4d2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Sep 2013 23:47:40 +0200
Subject: [PATCH 15/26] App settings activity

---
 .../res/layout/api_app_register_activity.xml  | 11 ++--
 .../res/layout/api_app_settings_activity.xml  |  5 +-
 .../res/layout/api_app_settings_fragment.xml  | 15 +++--
 OpenPGP-Keychain/res/values/strings.xml       | 13 +++-
 .../keychain/provider/KeychainProvider.java   |  7 ++
 .../remote_api/AppSettingsActivity.java       | 63 ++++++++++++++++--
 .../remote_api/AppSettingsFragment.java       | 66 ++++++++++++++++++-
 .../remote_api/RegisteredAppsAdapter.java     |  5 +-
 .../RegisteredAppsListFragment.java           |  2 +-
 .../keychain/ui/SelectPublicKeyFragment.java  | 13 ++--
 .../keychain/ui/SelectSecretKeyFragment.java  |  2 +-
 .../ui/widget/ImportKeysListLoader.java       | 10 ---
 .../ui/widget/SelectKeyCursorAdapter.java     | 12 ++--
 13 files changed, 174 insertions(+), 50 deletions(-)

diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
index b8b668681..c1b2a9c50 100644
--- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="8dp" >
 
     <fragment
         android:id="@+id/api_app_settings_fragment"
@@ -23,11 +24,10 @@
             android:id="@+id/register_crypto_consumer_question"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Package TODO requests permanent access to OpenPGP Keychain\&apos;s API. Allow permanent access?"
+            android:text="TODO: use string"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <LinearLayout
-            android:id="@+id/register_crypto_consumer_register_layout"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -38,16 +38,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Disallow access" />
+                android:text="@string/api_register_disallow" />
 
             <Button
                 android:id="@+id/register_crypto_consumer_allow"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Allow access" />
+                android:text="@string/api_register_allow" />
         </LinearLayout>
     </LinearLayout>
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
index e25a110cc..35caec434 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:padding="8dp"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -24,14 +25,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Revoke access" />
+            android:text="@string/api_settings_revoke" />
 
         <Button
             android:id="@+id/register_crypto_consumer_allow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Save" />
+            android:text="@string/api_settings_save" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
index 3763d3198..6db366297 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
@@ -11,36 +11,37 @@
         android:paddingBottom="3dip" >
 
         <TextView
-            android:id="@+id/register_crypto_consumer_select_key"
+            android:id="@+id/api_app_settings_selected_key"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
-            android:text="Select key"
+            android:text="@string/api_settings_no_key"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <Button
-            android:id="@+id/register_crypto_consumer_select_key_button"
+            android:id="@+id/api_app_settings_select_key_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="TD Select priv key" />
+            android:text="@string/api_settings_select_key" />
     </LinearLayout>
 
     <Button
         android:id="@+id/api_app_settings_advanced_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="show advanced settings" />
+        android:text="@string/api_settings_show_advanced" />
 
     <LinearLayout
         android:id="@+id/api_app_settings_advanced"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal"
+        android:visibility="invisible" >
 
         <CheckBox
-            android:id="@+id/asciiArmour"
+            android:id="@+id/api_app_ascii_armor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 5dfd0d312..d6253ea57 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -359,9 +359,18 @@
     <string name="intent_import_key">OpenPGP: Import Keyring</string>
     <string name="intent_send_encrypt">OpenPGP: Encrypt</string>
     <string name="intent_send_decrypt">OpenPGP: Decrypt</string>
-    
+
     <!-- Remote API -->
     <string name="api_no_apps">No registered applications!</string>
     <string name="api_unknown_app">Unknown app</string>
-    
+    <string name="api_settings_show_advanced">Show advanced settings…</string>
+    <string name="api_settings_hide_advanced">Hide advanced settings…</string>
+    <string name="api_settings_no_key">No key selected</string>
+    <string name="api_settings_select_key">Select key</string>
+    <string name="api_settings_save">Save</string>
+    <string name="api_settings_revoke">Revoke access</string>
+    <string name="api_register_text">%1$s (%2$s) requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
+    <string name="api_register_allow">Allow access</string>
+    <string name="api_register_disallow">Disallow access</string>
+
 </resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 5a86b0bdb..c875b7a70 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -611,6 +611,13 @@ public class KeychainProvider extends ContentProvider {
         case CRYPTO_CONSUMERS:
             qb.setTables(Tables.CRYPTO_CONSUMERS);
 
+            break;
+        case CRYPTO_CONSUMERS_BY_ROW_ID:
+            qb.setTables(Tables.CRYPTO_CONSUMERS);
+
+            qb.appendWhere(BaseColumns._ID + " = ");
+            qb.appendWhereEscapeString(uri.getLastPathSegment());
+
             break;
         case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
             qb.setTables(Tables.CRYPTO_CONSUMERS);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 31fbdc8a6..765cb8e2b 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -2,34 +2,89 @@ package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.util.Log;
 
+import android.content.ContentUris;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 public class AppSettingsActivity extends SherlockFragmentActivity {
 
+    private PackageManager pm;
+
+    long id;
+
+    String packageName;
+    long keyId;
+    boolean asciiArmor;
+
+    // derived
+    String appName;
+
+    // view
+    TextView selectedKey;
+    Button selectKeyButton;
+    CheckBox asciiArmorCheckBox;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        pm = getApplicationContext().getPackageManager();
+
         setContentView(R.layout.api_app_settings_activity);
 
-        // check if add new or edit existing
+        selectedKey = (TextView) findViewById(R.id.api_app_settings_selected_key);
+        selectKeyButton = (Button) findViewById(R.id.api_app_settings_select_key_button);
+        asciiArmorCheckBox = (CheckBox) findViewById(R.id.api_app_ascii_armor);
+
         Intent intent = getIntent();
         Uri appUri = intent.getData();
         if (appUri == null) {
             Log.e(Constants.TAG, "Intent data missing. Should be Uri of app!");
             finish();
             return;
+        } else {
+            Log.d(Constants.TAG, "uri: " + appUri);
+            loadData(appUri);
+        }
+    }
+
+    private void loadData(Uri appUri) {
+        Cursor cur = getContentResolver().query(appUri, null, null, null, null);
+        id = ContentUris.parseId(appUri);
+        if (cur.moveToFirst()) {
+            do {
+                packageName = cur.getString(cur
+                        .getColumnIndex(KeychainContract.CryptoConsumers.PACKAGE_NAME));
+                // get application name
+                try {
+                    ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+
+                    appName = (String) pm.getApplicationLabel(ai);
+                } catch (final NameNotFoundException e) {
+                    appName = getString(R.string.api_unknown_app);
+                }
+//                asciiArmor = (cur.getInt(cur
+//                        .getColumnIndex(KeychainContract.CryptoConsumers.ASCII_ARMOR)) == 1);
+
+                // display values
+//                asciiArmorCheckBox.setChecked(asciiArmor);
+
+            } while (cur.moveToNext());
         }
 
-        Log.d(Constants.TAG, "uri: " + appUri);
-        
-        
     }
 
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
index 4bb09d50f..98cf5abd5 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
@@ -1,15 +1,28 @@
 package org.sufficientlysecure.keychain.remote_api;
 
+import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.SelectSecretKeyActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.widget.Button;
+import android.widget.LinearLayout;
 
 public class AppSettingsFragment extends Fragment {
-    
+
+    private LinearLayout advancedSettingsContainer;
+    private Button advancedSettingsButton;
+
+    private Button selectKeyButton;
+
     /**
      * Inflate the layout for this fragment
      */
@@ -17,4 +30,55 @@ public class AppSettingsFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return inflater.inflate(R.layout.api_app_settings_fragment, container, false);
     }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        advancedSettingsButton = (Button) getActivity().findViewById(
+                R.id.api_app_settings_advanced_button);
+        advancedSettingsContainer = (LinearLayout) getActivity().findViewById(
+                R.id.api_app_settings_advanced);
+        selectKeyButton = (Button) getActivity().findViewById(
+                R.id.api_app_settings_select_key_button);
+
+        final Animation visibleAnimation = new AlphaAnimation(0.0f, 1.0f);
+        visibleAnimation.setDuration(250);
+        final Animation invisibleAnimation = new AlphaAnimation(1.0f, 0.0f);
+        invisibleAnimation.setDuration(250);
+
+        // TODO: Better: collapse/expand animation
+        // final Animation animation2 = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0.0f,
+        // Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, -1.0f,
+        // Animation.RELATIVE_TO_SELF, 0.0f);
+        // animation2.setDuration(150);
+
+        advancedSettingsButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                if (advancedSettingsContainer.getVisibility() == View.VISIBLE) {
+                    advancedSettingsContainer.startAnimation(invisibleAnimation);
+                    advancedSettingsContainer.setVisibility(View.INVISIBLE);
+                } else {
+                    advancedSettingsContainer.startAnimation(visibleAnimation);
+                    advancedSettingsContainer.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+
+        selectKeyButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                selectSecretKey();
+
+            }
+        });
+    }
+
+    private void selectSecretKey() {
+        Intent intent = new Intent(getActivity(), SelectSecretKeyActivity.class);
+        startActivityForResult(intent, Id.request.secret_keys);
+    }
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
index 61888ad5a..dcc0b973d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
@@ -35,9 +35,8 @@ public class RegisteredAppsAdapter extends CursorAdapter {
     private LayoutInflater mInflater;
     private PackageManager pm;
 
-    @SuppressWarnings("deprecation")
-    public RegisteredAppsAdapter(Context context, Cursor c) {
-        super(context, c);
+    public RegisteredAppsAdapter(Context context, Cursor c, int flags) {
+        super(context, c, flags);
 
         mInflater = LayoutInflater.from(context);
         pm = context.getApplicationContext().getPackageManager();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
index 52f4d1398..bd879a1b6 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
@@ -51,7 +51,7 @@ public class RegisteredAppsListFragment extends SherlockListFragment implements
         setHasOptionsMenu(true);
 
         // Create an empty adapter we will use to display the loaded data.
-        mAdapter = new RegisteredAppsAdapter(getActivity(), null);
+        mAdapter = new RegisteredAppsAdapter(getActivity(), null, 0);
         setListAdapter(mAdapter);
 
         // Prepare the loader. Either re-connect with an existing one,
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
index 8b3e75d05..b9c42a17c 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
@@ -67,7 +67,7 @@ public class SelectPublicKeyFragment extends ListFragmentWorkaround implements
         // application this would come from a resource.
         setEmptyText(getString(R.string.listEmpty));
 
-        mAdapter = new SelectKeyCursorAdapter(mActivity, mListView, null, Id.type.public_key);
+        mAdapter = new SelectKeyCursorAdapter(mActivity, null, 0, mListView, Id.type.public_key);
 
         setListAdapter(mAdapter);
 
@@ -160,11 +160,12 @@ public class SelectPublicKeyFragment extends ListFragmentWorkaround implements
                         + SelectKeyCursorAdapter.PROJECTION_ROW_AVAILABLE,
                 "(SELECT COUNT(valid_keys." + Keys._ID + ") FROM " + Tables.KEYS
                         + " AS valid_keys WHERE valid_keys." + Keys.KEY_RING_ROW_ID + " = "
-                        + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID + " AND valid_keys."
-                        + Keys.IS_REVOKED + " = '0' AND valid_keys." + Keys.CAN_ENCRYPT
-                        + " = '1' AND valid_keys." + Keys.CREATION + " <= '" + now + "' AND "
-                        + "(valid_keys." + Keys.EXPIRY + " IS NULL OR valid_keys." + Keys.EXPIRY
-                        + " >= '" + now + "')) AS " + SelectKeyCursorAdapter.PROJECTION_ROW_VALID, };
+                        + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
+                        + " AND valid_keys." + Keys.IS_REVOKED + " = '0' AND valid_keys."
+                        + Keys.CAN_ENCRYPT + " = '1' AND valid_keys." + Keys.CREATION + " <= '"
+                        + now + "' AND " + "(valid_keys." + Keys.EXPIRY + " IS NULL OR valid_keys."
+                        + Keys.EXPIRY + " >= '" + now + "')) AS "
+                        + SelectKeyCursorAdapter.PROJECTION_ROW_VALID, };
 
         String inMasterKeyList = null;
         if (mSelectedMasterKeyIds != null && mSelectedMasterKeyIds.length > 0) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
index 4871b74bc..9b87f085c 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
@@ -73,7 +73,7 @@ public class SelectSecretKeyFragment extends SherlockListFragment implements
         // application this would come from a resource.
         setEmptyText(getString(R.string.listEmpty));
 
-        mAdapter = new SelectKeyCursorAdapter(mActivity, mListView, null, Id.type.secret_key);
+        mAdapter = new SelectKeyCursorAdapter(mActivity, null, 0, mListView, Id.type.secret_key);
 
         setListAdapter(mAdapter);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
index 198140e0c..94d578384 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
@@ -23,19 +23,14 @@ import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import org.spongycastle.openpgp.PGPKeyRing;
 import org.spongycastle.openpgp.PGPObjectFactory;
-import org.spongycastle.openpgp.PGPPublicKeyRing;
-import org.spongycastle.openpgp.PGPPublicKeyRingCollection;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.spongycastle.openpgp.PGPSecretKeyRingCollection;
 import org.spongycastle.openpgp.PGPUtil;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
 import org.sufficientlysecure.keychain.helper.PgpHelper;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
@@ -45,11 +40,6 @@ import org.sufficientlysecure.keychain.R;
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
 
-/**
- * A custom Loader to search for bad adware apps, based on
- * https://github.com/brosmike/AirPush-Detector. Daniel Bjorge licensed it under Apachev2 after
- * asking him by mail.
- */
 public class ImportKeysListLoader extends AsyncTaskLoader<List<Map<String, String>>> {
     public static final String MAP_ATTR_USER_ID = "user_id";
     public static final String MAP_ATTR_FINGERPINT = "fingerprint";
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SelectKeyCursorAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SelectKeyCursorAdapter.java
index 17423136f..5d8b7d1b1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SelectKeyCursorAdapter.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SelectKeyCursorAdapter.java
@@ -44,9 +44,9 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
     public final static String PROJECTION_ROW_AVAILABLE = "available";
     public final static String PROJECTION_ROW_VALID = "valid";
 
-    @SuppressWarnings("deprecation")
-    public SelectKeyCursorAdapter(Context context, ListView listView, Cursor c, int keyType) {
-        super(context, c);
+    public SelectKeyCursorAdapter(Context context, Cursor c, int flags, ListView listView,
+            int keyType) {
+        super(context, c, flags);
 
         mInflater = LayoutInflater.from(context);
         mListView = listView;
@@ -65,8 +65,7 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-        boolean valid = cursor.getInt(cursor
-                .getColumnIndex(PROJECTION_ROW_VALID)) > 0;
+        boolean valid = cursor.getInt(cursor.getColumnIndex(PROJECTION_ROW_VALID)) > 0;
 
         TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId);
         mainUserId.setText(R.string.unknownUserId);
@@ -101,8 +100,7 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
                 status.setText(R.string.canSign);
             }
         } else {
-            if (cursor.getInt(cursor
-                    .getColumnIndex(PROJECTION_ROW_AVAILABLE)) > 0) {
+            if (cursor.getInt(cursor.getColumnIndex(PROJECTION_ROW_AVAILABLE)) > 0) {
                 // has some CAN_ENCRYPT keys, but col(ROW_VALID) = 0, so must be revoked or
                 // expired
                 status.setText(R.string.expired);

From 9a737c7318e20a56a7d7a2efd8602fb0bec05101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 Sep 2013 00:02:48 +0200
Subject: [PATCH 16/26] rename crypto consumers to api apps

---
 .../res/layout/api_app_register_activity.xml  |  7 +--
 .../res/layout/api_app_settings_activity.xml  |  5 +-
 .../keychain/provider/KeychainContract.java   | 12 ++--
 .../keychain/provider/KeychainDatabase.java   | 24 ++++----
 .../keychain/provider/KeychainProvider.java   | 28 ++++-----
 .../keychain/provider/ProviderHelper.java     | 10 ++--
 .../remote_api/AppSettingsActivity.java       | 60 ++++++++++++++++---
 .../remote_api/AppSettingsFragment.java       |  3 +-
 .../remote_api/RegisteredAppsAdapter.java     |  4 +-
 .../RegisteredAppsListFragment.java           | 12 ++--
 .../keychain/remote_api/ServiceActivity.java  | 34 ++++++-----
 11 files changed, 122 insertions(+), 77 deletions(-)

diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
index c1b2a9c50..da7bb16ce 100644
--- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
@@ -14,14 +14,13 @@
         tools:layout="@layout/api_app_settings_fragment" />
 
     <LinearLayout
-        android:id="@+id/register_crypto_consumer_register_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingBottom="3dip" >
 
         <TextView
-            android:id="@+id/register_crypto_consumer_question"
+            android:id="@+id/api_register_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="TODO: use string"
@@ -34,14 +33,14 @@
             android:paddingBottom="3dip" >
 
             <Button
-                android:id="@+id/register_crypto_consumer_disallow"
+                android:id="@+id/api_register_disallow"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/api_register_disallow" />
 
             <Button
-                android:id="@+id/register_crypto_consumer_allow"
+                android:id="@+id/api_register_allow"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
index 35caec434..b5e6e46ae 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -14,21 +14,20 @@
         tools:layout="@layout/api_app_settings_fragment" />
 
     <LinearLayout
-        android:id="@+id/register_crypto_consumer_edit_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingBottom="3dip" >
 
         <Button
-            android:id="@+id/register_crypto_consumer_disallow"
+            android:id="@+id/api_app_settings_revoke"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/api_settings_revoke" />
 
         <Button
-            android:id="@+id/register_crypto_consumer_allow"
+            android:id="@+id/api_app_settings_save"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 985498e3a..e9637c35d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -53,7 +53,7 @@ public class KeychainContract {
         String RANK = "rank";
     }
 
-    interface CryptoConsumersColumns {
+    interface ApiAppsColumns {
         String PACKAGE_NAME = "package_name";
         String PRIVATE_KEY_ID = "private_key_id"; // not a database id
         String ASCII_ARMOR = "ascii_armor";
@@ -87,7 +87,7 @@ public class KeychainContract {
     public static final String PATH_USER_IDS = "user_ids";
     public static final String PATH_KEYS = "keys";
 
-    public static final String BASE_CRYPTO_CONSUMERS = "crypto_consumers";
+    public static final String BASE_API_APPS = "api_apps";
     public static final String PATH_BY_PACKAGE_NAME = "package_name";
 
     public static class KeyRings implements KeyRingsColumns, BaseColumns {
@@ -219,15 +219,15 @@ public class KeychainContract {
         }
     }
 
-    public static class CryptoConsumers implements CryptoConsumersColumns, BaseColumns {
+    public static class ApiApps implements ApiAppsColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
-                .appendPath(BASE_CRYPTO_CONSUMERS).build();
+                .appendPath(BASE_API_APPS).build();
 
         /** Use if multiple items get returned */
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.crypto_consumers";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.api_apps";
 
         /** Use if a single item is returned */
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.crypto_consumers";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.api_apps";
 
         public static Uri buildIdUri(String rowId) {
             return CONTENT_URI.buildUpon().appendPath(rowId).build();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index 6f31f4945..283ab73e3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -18,7 +18,7 @@
 package org.sufficientlysecure.keychain.provider;
 
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumersColumns;
+import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAppsColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeysColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIdsColumns;
@@ -37,7 +37,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
         String KEY_RINGS = "key_rings";
         String KEYS = "keys";
         String USER_IDS = "user_ids";
-        String CRYPTO_CONSUMERS = "crypto_consumers";
+        String API_APPS = "api_apps";
     }
 
     private static final String CREATE_KEY_RINGS = "CREATE TABLE IF NOT EXISTS " + Tables.KEY_RINGS
@@ -64,14 +64,14 @@ public class KeychainDatabase extends SQLiteOpenHelper {
             + UserIdsColumns.KEY_RING_ROW_ID + ") REFERENCES " + Tables.KEY_RINGS + "("
             + BaseColumns._ID + ") ON DELETE CASCADE)";
 
-    private static final String CREATE_CRYPTO_CONSUMERS = "CREATE TABLE IF NOT EXISTS "
-            + Tables.CRYPTO_CONSUMERS + " (" + BaseColumns._ID
-            + " INTEGER PRIMARY KEY AUTOINCREMENT, " + CryptoConsumersColumns.PACKAGE_NAME
-            + " TEXT UNIQUE, " + CryptoConsumersColumns.PRIVATE_KEY_ID + " INT64, "
-            + CryptoConsumersColumns.ASCII_ARMOR + " INTEGER, "
-            + CryptoConsumersColumns.ENCRYPTION_ALGORITHM + " INTEGER, "
-            + CryptoConsumersColumns.HASH_ALORITHM + " INTEGER, "
-            + CryptoConsumersColumns.COMPRESSION + " INTEGER)";
+    private static final String CREATE_API_APPS = "CREATE TABLE IF NOT EXISTS "
+            + Tables.API_APPS + " (" + BaseColumns._ID
+            + " INTEGER PRIMARY KEY AUTOINCREMENT, " + ApiAppsColumns.PACKAGE_NAME
+            + " TEXT UNIQUE, " + ApiAppsColumns.PRIVATE_KEY_ID + " INT64, "
+            + ApiAppsColumns.ASCII_ARMOR + " INTEGER, "
+            + ApiAppsColumns.ENCRYPTION_ALGORITHM + " INTEGER, "
+            + ApiAppsColumns.HASH_ALORITHM + " INTEGER, "
+            + ApiAppsColumns.COMPRESSION + " INTEGER)";
 
     KeychainDatabase(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -84,7 +84,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
         db.execSQL(CREATE_KEY_RINGS);
         db.execSQL(CREATE_KEYS);
         db.execSQL(CREATE_USER_IDS);
-        db.execSQL(CREATE_CRYPTO_CONSUMERS);
+        db.execSQL(CREATE_API_APPS);
     }
 
     @Override
@@ -112,7 +112,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
                         + " = 1 WHERE " + KeysColumns.IS_MASTER_KEY + "= 1;");
                 break;
             case 4:
-                db.execSQL(CREATE_CRYPTO_CONSUMERS);
+                db.execSQL(CREATE_API_APPS);
 
             default:
                 break;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index c875b7a70..6275b3b5c 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
+import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyTypes;
@@ -228,10 +228,10 @@ public class KeychainProvider extends ContentProvider {
         /**
          * Crypto Consumers
          */
-        matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS, CRYPTO_CONSUMERS);
-        matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS + "/#",
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS, CRYPTO_CONSUMERS);
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/#",
                 CRYPTO_CONSUMERS_BY_ROW_ID);
-        matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS + "/"
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/"
                 + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", CRYPTO_CONSUMERS_BY_PACKAGE_NAME);
 
         /**
@@ -294,11 +294,11 @@ public class KeychainProvider extends ContentProvider {
             return UserIds.CONTENT_ITEM_TYPE;
 
         case CRYPTO_CONSUMERS:
-            return CryptoConsumers.CONTENT_TYPE;
+            return ApiApps.CONTENT_TYPE;
 
         case CRYPTO_CONSUMERS_BY_ROW_ID:
         case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
-            return CryptoConsumers.CONTENT_ITEM_TYPE;
+            return ApiApps.CONTENT_ITEM_TYPE;
 
         default:
             throw new UnsupportedOperationException("Unknown uri: " + uri);
@@ -609,19 +609,19 @@ public class KeychainProvider extends ContentProvider {
             break;
 
         case CRYPTO_CONSUMERS:
-            qb.setTables(Tables.CRYPTO_CONSUMERS);
+            qb.setTables(Tables.API_APPS);
 
             break;
         case CRYPTO_CONSUMERS_BY_ROW_ID:
-            qb.setTables(Tables.CRYPTO_CONSUMERS);
+            qb.setTables(Tables.API_APPS);
 
             qb.appendWhere(BaseColumns._ID + " = ");
             qb.appendWhereEscapeString(uri.getLastPathSegment());
 
             break;
         case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
-            qb.setTables(Tables.CRYPTO_CONSUMERS);
-            qb.appendWhere(CryptoConsumers.PACKAGE_NAME + " = ");
+            qb.setTables(Tables.API_APPS);
+            qb.appendWhere(ApiApps.PACKAGE_NAME + " = ");
             qb.appendWhereEscapeString(uri.getPathSegments().get(2));
 
             break;
@@ -712,8 +712,8 @@ public class KeychainProvider extends ContentProvider {
 
                 break;
             case CRYPTO_CONSUMERS:
-                rowId = db.insertOrThrow(Tables.CRYPTO_CONSUMERS, null, values);
-                rowUri = CryptoConsumers.buildIdUri(Long.toString(rowId));
+                rowId = db.insertOrThrow(Tables.API_APPS, null, values);
+                rowUri = ApiApps.buildIdUri(Long.toString(rowId));
 
                 break;
             default:
@@ -773,7 +773,7 @@ public class KeychainProvider extends ContentProvider {
             break;
         case CRYPTO_CONSUMERS_BY_ROW_ID:
         case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
-            count = db.delete(Tables.CRYPTO_CONSUMERS,
+            count = db.delete(Tables.API_APPS,
                     buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs);
             break;
         default:
@@ -838,7 +838,7 @@ public class KeychainProvider extends ContentProvider {
                 break;
             case CRYPTO_CONSUMERS_BY_ROW_ID:
             case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
-                count = db.update(Tables.CRYPTO_CONSUMERS, values,
+                count = db.update(Tables.API_APPS, values,
                         buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs);
                 break;
             default:
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 57d3b54d6..c8f9baeff 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -31,7 +31,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
 import org.sufficientlysecure.keychain.helper.PgpHelper;
 import org.sufficientlysecure.keychain.helper.PgpMain;
-import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
+import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
@@ -719,12 +719,12 @@ public class ProviderHelper {
     }
 
     public static ArrayList<String> getCryptoConsumers(Context context) {
-        Cursor cursor = context.getContentResolver().query(CryptoConsumers.CONTENT_URI, null, null,
+        Cursor cursor = context.getContentResolver().query(ApiApps.CONTENT_URI, null, null,
                 null, null);
 
         ArrayList<String> packageNames = new ArrayList<String>();
         if (cursor != null) {
-            int packageNameCol = cursor.getColumnIndex(CryptoConsumers.PACKAGE_NAME);
+            int packageNameCol = cursor.getColumnIndex(ApiApps.PACKAGE_NAME);
             if (cursor.moveToFirst()) {
                 do {
                     packageNames.add(cursor.getString(packageNameCol));
@@ -741,7 +741,7 @@ public class ProviderHelper {
 
     public static void addCryptoConsumer(Context context, String packageName) {
         ContentValues values = new ContentValues();
-        values.put(CryptoConsumers.PACKAGE_NAME, packageName);
-        context.getContentResolver().insert(CryptoConsumers.CONTENT_URI, values);
+        values.put(ApiApps.PACKAGE_NAME, packageName);
+        context.getContentResolver().insert(ApiApps.CONTENT_URI, values);
     }
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 765cb8e2b..3046dd0d2 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -6,6 +6,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.util.Log;
 
 import android.content.ContentUris;
+import android.content.ContentValues;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -13,6 +14,8 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
@@ -20,22 +23,24 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 public class AppSettingsActivity extends SherlockFragmentActivity {
-
     private PackageManager pm;
 
+    // model
+    Uri appUri;
     long id;
-
     String packageName;
     long keyId;
     boolean asciiArmor;
 
-    // derived
+    // model, derived
     String appName;
 
     // view
     TextView selectedKey;
     Button selectKeyButton;
     CheckBox asciiArmorCheckBox;
+    Button saveButton;
+    Button revokeButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,9 +53,26 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
         selectedKey = (TextView) findViewById(R.id.api_app_settings_selected_key);
         selectKeyButton = (Button) findViewById(R.id.api_app_settings_select_key_button);
         asciiArmorCheckBox = (CheckBox) findViewById(R.id.api_app_ascii_armor);
+        revokeButton = (Button) findViewById(R.id.api_app_settings_revoke);
+        saveButton = (Button) findViewById(R.id.api_app_settings_save);
+
+        revokeButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                revokeAccess();
+            }
+        });
+        saveButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                save();
+            }
+        });
 
         Intent intent = getIntent();
-        Uri appUri = intent.getData();
+        appUri = intent.getData();
         if (appUri == null) {
             Log.e(Constants.TAG, "Intent data missing. Should be Uri of app!");
             finish();
@@ -67,7 +89,7 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
         if (cur.moveToFirst()) {
             do {
                 packageName = cur.getString(cur
-                        .getColumnIndex(KeychainContract.CryptoConsumers.PACKAGE_NAME));
+                        .getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME));
                 // get application name
                 try {
                     ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
@@ -76,15 +98,35 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
                 } catch (final NameNotFoundException e) {
                     appName = getString(R.string.api_unknown_app);
                 }
-//                asciiArmor = (cur.getInt(cur
-//                        .getColumnIndex(KeychainContract.CryptoConsumers.ASCII_ARMOR)) == 1);
 
-                // display values
-//                asciiArmorCheckBox.setChecked(asciiArmor);
+                try {
+                    asciiArmor = (cur.getInt(cur
+                            .getColumnIndexOrThrow(KeychainContract.ApiApps.ASCII_ARMOR)) == 1);
+
+                    // display values
+                    asciiArmorCheckBox.setChecked(asciiArmor);
+                } catch (IllegalArgumentException e) {
+                    Log.e(Constants.TAG, "AppSettingsActivity", e);
+                }
 
             } while (cur.moveToNext());
         }
+    }
 
+    private void revokeAccess() {
+        Uri calUri = ContentUris.withAppendedId(appUri, id);
+        getContentResolver().delete(calUri, null, null);
+        finish();
+    }
+
+    private void save() {
+        final ContentValues cv = new ContentValues();
+        cv.put(KeychainContract.ApiApps.PACKAGE_NAME, packageName);
+        cv.put(KeychainContract.ApiApps.ASCII_ARMOR, asciiArmor);
+        // TODO: other parameter
+        getContentResolver().update(appUri, cv, null, null);
+
+        finish();
     }
 
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
index 98cf5abd5..ec983dc06 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
@@ -60,9 +60,11 @@ public class AppSettingsFragment extends Fragment {
                 if (advancedSettingsContainer.getVisibility() == View.VISIBLE) {
                     advancedSettingsContainer.startAnimation(invisibleAnimation);
                     advancedSettingsContainer.setVisibility(View.INVISIBLE);
+                    advancedSettingsButton.setText(R.string.api_settings_show_advanced);
                 } else {
                     advancedSettingsContainer.startAnimation(visibleAnimation);
                     advancedSettingsContainer.setVisibility(View.VISIBLE);
+                    advancedSettingsButton.setText(R.string.api_settings_hide_advanced);
                 }
             }
         });
@@ -72,7 +74,6 @@ public class AppSettingsFragment extends Fragment {
             @Override
             public void onClick(View v) {
                 selectSecretKey();
-
             }
         });
     }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
index dcc0b973d..71a819ec2 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
@@ -17,7 +17,7 @@
 package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
+import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -47,7 +47,7 @@ public class RegisteredAppsAdapter extends CursorAdapter {
         TextView text1 = (TextView) view.findViewById(android.R.id.text1);
         TextView text2 = (TextView) view.findViewById(android.R.id.text2);
 
-        String packageName = cursor.getString(cursor.getColumnIndex(CryptoConsumers.PACKAGE_NAME));
+        String packageName = cursor.getString(cursor.getColumnIndex(ApiApps.PACKAGE_NAME));
         if (packageName != null) {
             text2.setText(packageName);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
index bd879a1b6..5ab210d5f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
@@ -2,7 +2,7 @@ package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
-import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
+import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
 
 import com.actionbarsherlock.app.SherlockListFragment;
 
@@ -38,7 +38,7 @@ public class RegisteredAppsListFragment extends SherlockListFragment implements
                 // edit app settings
                 Intent intent = new Intent(getActivity(), AppSettingsActivity.class);
                 intent.setData(ContentUris.withAppendedId(
-                        KeychainContract.CryptoConsumers.CONTENT_URI, id));
+                        KeychainContract.ApiApps.CONTENT_URI, id));
                 startActivity(intent);
             }
         });
@@ -60,20 +60,20 @@ public class RegisteredAppsListFragment extends SherlockListFragment implements
     }
 
     // These are the Contacts rows that we will retrieve.
-    static final String[] CONSUMERS_SUMMARY_PROJECTION = new String[] { CryptoConsumers._ID,
-            CryptoConsumers.PACKAGE_NAME };
+    static final String[] CONSUMERS_SUMMARY_PROJECTION = new String[] { ApiApps._ID,
+            ApiApps.PACKAGE_NAME };
 
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         // This is called when a new Loader needs to be created. This
         // sample only has one Loader, so we don't care about the ID.
         // First, pick the base URI to use depending on whether we are
         // currently filtering.
-        Uri baseUri = CryptoConsumers.CONTENT_URI;
+        Uri baseUri = ApiApps.CONTENT_URI;
 
         // Now create and return a CursorLoader that will take care of
         // creating a Cursor for the data being displayed.
         return new CursorLoader(getActivity(), baseUri, CONSUMERS_SUMMARY_PROJECTION, null, null,
-                CryptoConsumers.PACKAGE_NAME + " COLLATE LOCALIZED ASC");
+                ApiApps.PACKAGE_NAME + " COLLATE LOCALIZED ASC");
     }
 
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 5849fb80d..703093f0a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -134,22 +134,26 @@ public class ServiceActivity extends SherlockFragmentActivity {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
 
             setContentView(R.layout.api_app_settings_activity);
-            LinearLayout layoutRegister = (LinearLayout) findViewById(R.id.register_crypto_consumer_register_layout);
-            LinearLayout layoutEdit = (LinearLayout) findViewById(R.id.register_crypto_consumer_edit_layout);
+            
+            //TODO: handle if app is already registered
+            // LinearLayout layoutRegister = (LinearLayout)
+            // findViewById(R.id.register_crypto_consumer_register_layout);
+            // LinearLayout layoutEdit = (LinearLayout)
+            // findViewById(R.id.register_crypto_consumer_edit_layout);
+            //
+            // // if already registered show edit buttons
+            // ArrayList<String> allowedPkgs = ProviderHelper.getCryptoConsumers(this);
+            // if (allowedPkgs.contains(packageName)) {
+            // Log.d(Constants.TAG, "Package is allowed! packageName: " + packageName);
+            // layoutRegister.setVisibility(View.GONE);
+            // layoutEdit.setVisibility(View.VISIBLE);
+            // } else {
+            // layoutRegister.setVisibility(View.VISIBLE);
+            // layoutEdit.setVisibility(View.GONE);
+            // }
 
-            // if already registered show edit buttons
-            ArrayList<String> allowedPkgs = ProviderHelper.getCryptoConsumers(this);
-            if (allowedPkgs.contains(packageName)) {
-                Log.d(Constants.TAG, "Package is allowed! packageName: " + packageName);
-                layoutRegister.setVisibility(View.GONE);
-                layoutEdit.setVisibility(View.VISIBLE);
-            } else {
-                layoutRegister.setVisibility(View.VISIBLE);
-                layoutEdit.setVisibility(View.GONE);
-            }
-
-            Button allowButton = (Button) findViewById(R.id.register_crypto_consumer_allow);
-            Button disallowButton = (Button) findViewById(R.id.register_crypto_consumer_disallow);
+            Button allowButton = (Button) findViewById(R.id.api_register_allow);
+            Button disallowButton = (Button) findViewById(R.id.api_register_disallow);
 
             allowButton.setOnClickListener(new OnClickListener() {
 

From 8614ff2ec74447f7199a5822f9331a0991161038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 Sep 2013 00:27:17 +0200
Subject: [PATCH 17/26] Fix revoke and save

---
 .../keychain/provider/KeychainProvider.java   | 63 +++++++++++--------
 .../remote_api/AppSettingsActivity.java       | 55 ++++++++--------
 .../keychain/remote_api/ServiceActivity.java  |  6 +-
 3 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 6275b3b5c..98a45d69f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -78,9 +78,9 @@ public class KeychainProvider extends ContentProvider {
     private static final int SECRET_KEY_RING_USER_ID = 221;
     private static final int SECRET_KEY_RING_USER_ID_BY_ROW_ID = 222;
 
-    private static final int CRYPTO_CONSUMERS = 301;
-    private static final int CRYPTO_CONSUMERS_BY_ROW_ID = 302;
-    private static final int CRYPTO_CONSUMERS_BY_PACKAGE_NAME = 303;
+    private static final int API_APPS = 301;
+    private static final int API_APPS_BY_ROW_ID = 302;
+    private static final int API_APPS_BY_PACKAGE_NAME = 303;
 
     // private static final int DATA_STREAM = 401;
 
@@ -226,13 +226,12 @@ public class KeychainProvider extends ContentProvider {
                 SECRET_KEY_RING_USER_ID_BY_ROW_ID);
 
         /**
-         * Crypto Consumers
+         * API apps
          */
-        matcher.addURI(authority, KeychainContract.BASE_API_APPS, CRYPTO_CONSUMERS);
-        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/#",
-                CRYPTO_CONSUMERS_BY_ROW_ID);
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS, API_APPS);
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/#", API_APPS_BY_ROW_ID);
         matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/"
-                + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", CRYPTO_CONSUMERS_BY_PACKAGE_NAME);
+                + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", API_APPS_BY_PACKAGE_NAME);
 
         /**
          * data stream
@@ -293,11 +292,11 @@ public class KeychainProvider extends ContentProvider {
         case SECRET_KEY_RING_USER_ID_BY_ROW_ID:
             return UserIds.CONTENT_ITEM_TYPE;
 
-        case CRYPTO_CONSUMERS:
+        case API_APPS:
             return ApiApps.CONTENT_TYPE;
 
-        case CRYPTO_CONSUMERS_BY_ROW_ID:
-        case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
+        case API_APPS_BY_ROW_ID:
+        case API_APPS_BY_PACKAGE_NAME:
             return ApiApps.CONTENT_ITEM_TYPE;
 
         default:
@@ -608,18 +607,18 @@ public class KeychainProvider extends ContentProvider {
 
             break;
 
-        case CRYPTO_CONSUMERS:
+        case API_APPS:
             qb.setTables(Tables.API_APPS);
 
             break;
-        case CRYPTO_CONSUMERS_BY_ROW_ID:
+        case API_APPS_BY_ROW_ID:
             qb.setTables(Tables.API_APPS);
 
             qb.appendWhere(BaseColumns._ID + " = ");
             qb.appendWhereEscapeString(uri.getLastPathSegment());
 
             break;
-        case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
+        case API_APPS_BY_PACKAGE_NAME:
             qb.setTables(Tables.API_APPS);
             qb.appendWhere(ApiApps.PACKAGE_NAME + " = ");
             qb.appendWhereEscapeString(uri.getPathSegments().get(2));
@@ -711,7 +710,7 @@ public class KeychainProvider extends ContentProvider {
                 rowUri = UserIds.buildSecretUserIdsUri(Long.toString(rowId));
 
                 break;
-            case CRYPTO_CONSUMERS:
+            case API_APPS:
                 rowId = db.insertOrThrow(Tables.API_APPS, null, values);
                 rowUri = ApiApps.buildIdUri(Long.toString(rowId));
 
@@ -771,10 +770,13 @@ public class KeychainProvider extends ContentProvider {
             count = db.delete(Tables.KEYS, buildDefaultUserIdsSelection(uri, selection),
                     selectionArgs);
             break;
-        case CRYPTO_CONSUMERS_BY_ROW_ID:
-        case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
-            count = db.delete(Tables.API_APPS,
-                    buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs);
+        case API_APPS_BY_ROW_ID:
+            count = db.delete(Tables.API_APPS, buildDefaultApiAppsSelection(uri, false, selection),
+                    selectionArgs);
+            break;
+        case API_APPS_BY_PACKAGE_NAME:
+            count = db.delete(Tables.API_APPS, buildDefaultApiAppsSelection(uri, true, selection),
+                    selectionArgs);
             break;
         default:
             throw new UnsupportedOperationException("Unknown uri: " + uri);
@@ -836,10 +838,13 @@ public class KeychainProvider extends ContentProvider {
                 count = db.update(Tables.USER_IDS, values,
                         buildDefaultUserIdsSelection(uri, selection), selectionArgs);
                 break;
-            case CRYPTO_CONSUMERS_BY_ROW_ID:
-            case CRYPTO_CONSUMERS_BY_PACKAGE_NAME:
+            case API_APPS_BY_ROW_ID:
                 count = db.update(Tables.API_APPS, values,
-                        buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs);
+                        buildDefaultApiAppsSelection(uri, false, selection), selectionArgs);
+                break;
+            case API_APPS_BY_PACKAGE_NAME:
+                count = db.update(Tables.API_APPS, values,
+                        buildDefaultApiAppsSelection(uri, true, selection), selectionArgs);
                 break;
             default:
                 throw new UnsupportedOperationException("Unknown uri: " + uri);
@@ -930,20 +935,26 @@ public class KeychainProvider extends ContentProvider {
     }
 
     /**
-     * Build default selection statement for Crypto Consumers. If no extra selection is specified
-     * only build where clause with rowId
+     * Build default selection statement for API apps. If no extra selection is specified only build
+     * where clause with rowId
      * 
      * @param uri
      * @param selection
      * @return
      */
-    private String buildDefaultCryptoConsumersSelection(Uri uri, String selection) {
+    private String buildDefaultApiAppsSelection(Uri uri, boolean packageSelection, String selection) {
+        String lastPathSegment = uri.getLastPathSegment();
+
         String andSelection = "";
         if (!TextUtils.isEmpty(selection)) {
             andSelection = " AND (" + selection + ")";
         }
 
-        return selection + andSelection;
+        if (packageSelection) {
+            return ApiApps.PACKAGE_NAME + "=" + lastPathSegment + andSelection;
+        } else {
+            return BaseColumns._ID + "=" + lastPathSegment + andSelection;
+        }
     }
 
     // @Override
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 3046dd0d2..6316dbc38 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -27,10 +27,8 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
     // model
     Uri appUri;
-    long id;
     String packageName;
     long keyId;
-    boolean asciiArmor;
 
     // model, derived
     String appName;
@@ -85,46 +83,45 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
     private void loadData(Uri appUri) {
         Cursor cur = getContentResolver().query(appUri, null, null, null, null);
-        id = ContentUris.parseId(appUri);
         if (cur.moveToFirst()) {
-            do {
-                packageName = cur.getString(cur
-                        .getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME));
-                // get application name
-                try {
-                    ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+            packageName = cur.getString(cur.getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME));
+            // get application name
+            try {
+                ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
 
-                    appName = (String) pm.getApplicationLabel(ai);
-                } catch (final NameNotFoundException e) {
-                    appName = getString(R.string.api_unknown_app);
-                }
+                appName = (String) pm.getApplicationLabel(ai);
+            } catch (final NameNotFoundException e) {
+                appName = getString(R.string.api_unknown_app);
+            }
+            setTitle(appName);
 
-                try {
-                    asciiArmor = (cur.getInt(cur
-                            .getColumnIndexOrThrow(KeychainContract.ApiApps.ASCII_ARMOR)) == 1);
+            try {
+                boolean asciiArmor = (cur.getInt(cur
+                        .getColumnIndexOrThrow(KeychainContract.ApiApps.ASCII_ARMOR)) == 1);
+                asciiArmorCheckBox.setChecked(asciiArmor);
 
-                    // display values
-                    asciiArmorCheckBox.setChecked(asciiArmor);
-                } catch (IllegalArgumentException e) {
-                    Log.e(Constants.TAG, "AppSettingsActivity", e);
-                }
-
-            } while (cur.moveToNext());
+            } catch (IllegalArgumentException e) {
+                Log.e(Constants.TAG, "AppSettingsActivity", e);
+            }
         }
     }
 
     private void revokeAccess() {
-        Uri calUri = ContentUris.withAppendedId(appUri, id);
-        getContentResolver().delete(calUri, null, null);
+        if (getContentResolver().delete(appUri, null, null) <= 0) {
+            throw new RuntimeException();
+        }
         finish();
     }
 
     private void save() {
+        Log.d(Constants.TAG, "saving");
         final ContentValues cv = new ContentValues();
-        cv.put(KeychainContract.ApiApps.PACKAGE_NAME, packageName);
-        cv.put(KeychainContract.ApiApps.ASCII_ARMOR, asciiArmor);
-        // TODO: other parameter
-        getContentResolver().update(appUri, cv, null, null);
+        // cv.put(KeychainContract.ApiApps.PACKAGE_NAME, packageName);
+        cv.put(KeychainContract.ApiApps.ASCII_ARMOR, asciiArmorCheckBox.isChecked());
+        // TODO: other parameters
+        if (getContentResolver().update(appUri, cv, null, null) <= 0) {
+            throw new RuntimeException();
+        }
 
         finish();
     }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 703093f0a..00bba7757 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -133,9 +133,9 @@ public class ServiceActivity extends SherlockFragmentActivity {
         if (ACTION_REGISTER.equals(action)) {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
 
-            setContentView(R.layout.api_app_settings_activity);
-            
-            //TODO: handle if app is already registered
+            setContentView(R.layout.api_app_register_activity);
+
+            // TODO: handle if app is already registered
             // LinearLayout layoutRegister = (LinearLayout)
             // findViewById(R.id.register_crypto_consumer_register_layout);
             // LinearLayout layoutEdit = (LinearLayout)

From 00d03d452ecde61cd6fe29eeadbf7a3d2e9050e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 Sep 2013 21:25:49 +0200
Subject: [PATCH 18/26] Include DoneBar for edit activities

---
 .../res/drawable-hdpi/ic_action_cancel.png    | Bin 0 -> 1358 bytes
 .../res/drawable-hdpi/ic_action_done.png      | Bin 0 -> 1320 bytes
 .../res/drawable-mdpi/ic_action_cancel.png    | Bin 0 -> 1202 bytes
 .../res/drawable-mdpi/ic_action_done.png      | Bin 0 -> 1197 bytes
 .../res/drawable-xhdpi/ic_action_cancel.png   | Bin 0 -> 1488 bytes
 .../res/drawable-xhdpi/ic_action_done.png     | Bin 0 -> 1546 bytes
 .../res/layout/actionbar_custom_view_done.xml |  27 +++++++
 .../actionbar_custom_view_done_cancel.xml     |  29 ++++++++
 .../actionbar_include_cancel_button.xml       |  36 +++++++++
 .../layout/actionbar_include_done_button.xml  |  36 +++++++++
 .../res/layout/api_app_settings_activity.xml  |  29 +-------
 .../res/menu/api_app_settings.xml             |  13 ++++
 OpenPGP-Keychain/res/values/strings.xml       |   1 +
 .../remote_api/AppSettingsActivity.java       |  69 +++++++++++++-----
 14 files changed, 194 insertions(+), 46 deletions(-)
 create mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png
 create mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png
 create mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png
 create mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png
 create mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png
 create mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
 create mode 100644 OpenPGP-Keychain/res/menu/api_app_settings.xml

diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde36e1fa7b8fb99cd7cdb3dc1e18466196750b0
GIT binary patch
literal 1358
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVitz{uRt(ZJBu$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OnfUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dF1J{^
zx#2Vqsy79<TMTgO)dxC89~8AnQ4JFUrXLU!o^XL2c+yYJ1E%*PV8V90pR|mDf$@N+
zi(^Q|tv55zdmVNVIJUiTBm4WN_kmRtX5E^-AmBq>jq(2n!XhGjGPNr-YWW@CJDHmK
zJ&5LLy_WOYcc}%pyr$}zn*DR{o;AsRQu%IMrAprEc1DQ?5c-qP5dZa9*lN*t_QHER
z?wyGH=Gwl<I?!yc-%HVquBt`Ff%a_s9=UuI+}$2i(ja`%;fw044m}S6xs6sGwhnq$
z2V6|t4*3U8XAnG7E_hk_c*{Qals#SRTrGvp73d!G-I$j>V}9bzo}}cX=i=H})~T@^
z-4ng}PpM+Yv)JCRyY*PE?peK)F<J4&Guej{Yq%CB&13u^eMEJg*0V^4(+WWs&G&hm
zo-t+=Q@kY9a@puS8;3ynqMa`?68UWo{<(82^C(x#Wi=he_*G{N)p~Zd2(f-%Xqdgo
zQ2Md)YQ~V22UZpDldxXG7QmV?_2-_HYncueuAgT*iF>nl<no6o{AoM0+VKbPtnkJU
z(q{hc9gG$Na~HWLd@(yMb)fBq-2Q_r`8SyfiFB5G_C_{HD5kZ^<o0sebl82k_iW}3
zA(jr7t9y@Lp3N69<wxL__VDg4b!;2k7L`9)A+tO2e~=V7bU^|9@P}Xm1J}c|E6;YF
Q3;>mIp00i_>zopr0MX;(_W%F@

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..58bf972171f199c359dcdb3bc6233ac84c7853d3
GIT binary patch
literal 1320
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi#&Ct}+$imdr$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+d7PlC?
zn3-5OIXVK(v%u~ah~5<3ZZW~>7JZ;&^g&UJ6xA>xVEO?u;RzSWfhYacJYae+0w(OB
zPunsW7#L@Hx;TbZ+<G%}x7QH|k+yQv7pr=eb|@Tl5@FdI(A276*EUy7N$HjJ50$3Y
zMN`EdEfsdLR@F~@${kS={m8zE>F}XRH$BVJ_~tbB>ux&w{i&Jpl6k3-y`NvKHk21q
zV1%GG?pIzqOj6l*_t-(U9qjp;vo`HwN=}ep)5vUa_N7?Rr}hN4ng+Fwoh&_BpW+wD
z&uL8OV?3O|erD1ih8>LjGWVRk>cn-L{3q>ay)F~Cc;}x<WzVMm5pAzrFlEpChD)F9
zn6)N;7Y&%XC)2?;q;hgYWdX}Frz!ee5e(G{eb-bAGd{U8Dlc#p_MW`#hlR?|MGfKw
zJavwzjTSBcq;~#*w#CMt7d!X7j6R{3<T3gDb+hu&)8)qeCBh5KDrYCmd~&t;3x{6q
z`%Yh_DSyNwu0EN6pi*P@FF(P_B{3)0H|HC8d|Ljce*5fSO&q4%UY0jK>n`8m#J@(k
z@^-_wj*fK>KI!`&dhL6Y<hOtBl^=z=@kg^v`ZF$`c^k6tjP4aV!Ha2s4lVujKPb}f
jlV<~q2NeDNA)LTq_^Hw$=hos4pt8%;)z4*}Q$iB}o<G>6

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f4c3d6a2b5bffc7529ef77789f4b9a1258c967e
GIT binary patch
literal 1202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVitz{uRt(ZJNy$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY
zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zW{wmsWnf@b@pN$v
zskrrKx+7PUgGig{Ew_XRoJvIx&xNMH;Bgf9c%jf3>+pg{?(kf0RjbAe4(c1sKd|em
z&8?IYI&<KB&*L+H=AYTKe3$QKi{NQ9jSDw2h$R#?R9-);(X}n)t*7S8%pKplN>oxS
z=Y{Jq%y{p?9pof5>zUk37p}tC!tD>-v^*F!j~%jlX824bqPdnW%cgQA=S4Gp!|ifa
z9Ia|Cr($|US!)G!iZ2_4IO-@)+vz7#(>$R~`U>BzW6$omsPO6;#5k+|I&weNiLb$?
zApOlxX08j*|4J>Wz4iXaXO`T_DMy(CT5oY1d4}mU?6VM$>A1=9tXbg~L(O58#Z4dD
z8Du_qnR*)Kb_ir|Fivc<GW9Vkdh_+O<0aDzTkX}v4lw!feh^Dw*r}Fq{cmYmF{l*r
MboFyt=akR{0B+)xg#Z8m

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf5fab3adf243318d11ec95448c6deae3f52d9b1
GIT binary patch
literal 1197
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi#&Ct}+$imXp$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O?oUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1@
zG!Lpb1-Dx)aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z*4|&C&cMJZ@9E+g
zQgQ3ebbs!H2{Omc#n}0tv`#21C~#0@f8W4;a{i~dB^meHw?8lo^y+Np_VX($n(_YC
z@+E&a+Mh40ocC+XEx!5ZZ+*78?c#g6#lYQ#qw)iToIq8>mujbJsbce3PBczkwdxup
zkDJUF2f-x=jZU}=Fgph@h!<?CWwGnicroD*-?Ik-S5&S%jSW!xdB)?M)&u4BH7CD2
z>N>j@?Pr!beU|A<XC%AkwW7@pYA>1vJvL35&6;ySFy-J4wL_Ed=se(2D>)PC;-R9y
zdup`rq1*C;xs&W09=YXh=ju@sDp||AN+rHQcJ=j-`9~Vw?O~j!62JMM+>gE!%~B^t
z*B7ZvUsQj@6<2p>=j`nZ<qTORH+;?hE%LLUlm7u@BKsaz35Kb;eu6rZ+223~h^MQc
J%Q~loCIIwnnArdT

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca7d159fdaa906473fa7ce7a63814ced79c89db3
GIT binary patch
literal 1488
zcmaJ>eM}Q~7(QxcD@Za65}eZ<M;#=y_fcAEPs&Go1sXhPpqrhU({gvfrQC<tL)tnw
zM%Xeo78aro2ph~l6t_ttSr(_r#KjG>sB-}ef}1mJ=pu1TnGR)hR|K{{WS89i-rt+|
zdEV#!$Thi23KQa<jspN7!C6F<DQ8~veKJ=0e$4LvK{?jS4v$<eRLXT;i2?Fyp@IRO
zoVSW8W4v^5_jx8809NQ&w@3DnTX9O@U~e=A4sfD^27v6`fas-sj0{#VRV;6X?wtA(
z0$JJ$Z8MQ5DcYH8wkRYq<)IQc74lIQ8p_Q9vjez7z%jBH3~)8P9}ifed0t$xqizHO
z=R;(l6?!DfL%Kk_ATgi`M)ee$g@IW{7&D?4qh%9lKrs}-3<zr0V<>Ji<0u9$Jdl!2
zqAT$-qF^DHa<f9!vMk~VQdd_8*JZ+jRE1y`iv>Xqh{2#&BJ}<sFM9)e-k-L}Krntv
zVnvx1creQ7tq^KuE2JoWR01b1(enO<HYp850$vfpU^H6NVjxNWe<;T-Mf>G4=3l*!
zCHA|6B7>AMexX*Pl)+V|MN^5mU1GelAh`vhX0eN|YC#tK)q)7x%S|u_l3t4Cqn>#L
zN#ai4FMD~4aS~QY;ec6|#<2ohCT1rbCL2m%m;<vIF^j`!v*#C>FtgEyEn*3Qs^u77
zUc}N0)_@w!n5AHOY;+koQOQg&61#_?3nYO9=ZnVK<+a$C*YXHUKSs+!9mKL&L=l5T
zNBf^qFS?ZdiJD7`t6Y{=pW&5#mz2f6ccobc04kf4$ae>>-tH(ZQDG_Pwv4FXtwJ~0
z_MCuf=vxKiM;j7$bibTuCd}{`>fcwzzIf(OQ_ysQ)?MrxSo>9Y@{QEg>F|$x*B`#1
zV>>!_@J%Wg5SJH|0j%r>lIj;O^{Qjz(<fV2Ts~Hv8cGen3gfFuVrOKw-<|$oP2A?B
zYj0g7jvP90^MG-7;HJuSVo&<^gSUoW$hfh6IC0-eT~jZy;_T!TDbEd#T8Aq}ft>62
zKdjbEK2}{<f#;s}_?l1K^fGYi5c}Pw*zobz>mQg?z76L%6kn|G@724T+Z(f|5}SA2
z8lZd`e6mF|-r4p1^u(1(*QYwdKfnW6>r*4MDZsB=ZSoWq)03u2nxa%at?G`*@tFNi
z)krY59&&bX+4)UnPmwlD45ts0;xluVbMHhho42h3ax}^C1Ko)`?+*(7kvD(JUYFO_
zh}}3nctq2CO&b9DPmThwXy>eFN=NBuAAY@QsAIiwTRn4JT{eWgZrtp4wiVa6*Z-zV
zKR3$$(h=+<R=#&H_s-QsdMLekcq4kIvF~AI?9{%ymciG${+d$H{h?{8Rf1eIV>x%v
zYuDtBRqYLFYvMZvqvrFC7tIIN<IvPPX9L$BnbD0V<E3N+cQo>u&K-jqCo=mvXG&Jg
zb<Z%S*!?=$6~7M=TWk~Y+Tt6|l0cuV3l%DT<G)XQ32ECKX#TnLVbF27rtp62{>M!A
ccEy9_T>$nr-nlNE-y8kMIvpiMuWeVuKec}rRR910

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8915716e06792d926f397a7b17346f656c86aa1
GIT binary patch
literal 1546
zcmaJ>eM}Q~7(NOZ>jx?|Mx7)_1qW{Q?n+DPg;FVn(P<eL2AvAw+8*>M_rcwjwgk7z
zaExq;FcCM$1T(WNW-4=WI(1VrnIo~NbIM>M*htY0#}vP^FxeFW{X=%i-TV8!d7tO~
zdUEwS*{>~}w{ji;01FLSdXr$+1>d=Igzo{O;<{i~@EK-4moDL57>fgGHrj%N1`;d9
zO*m%rRCM7f01z5O<e7Q1aRX|lNf{Q5k-14mKm$OE*3Dp62hM{Qyp*6c($SNrr66I`
zNDGuk*vO>gb|R~a#dE8&^Q=`4tJ)^jrh+MMR3IR69s}KEImMxFjdYS170y97Bn2l!
zc!x&%v?#MN2TZ3~98}8S1S_0`fJq7&qJY&3^{b#9Mqmh$L$E3Vfl;Ljg%NP-kqX&Z
zTM25?XHMl3ZW^hb=NS}&TrQW)l_;axQV3D2)etO)<nja|B7yTzJmyZIxYg4PdYrSe
z1j7?F1qK;03+?1JQlZkPEs)F%EyYcZNf;R9#ux~Z!NHcM1C7T24<*T&XpT4G&+2_4
zF_-6IaL9ynw3D?8iz`_jOvRw-EROLsn@7{-(^Jf`(>%@DX$DNsRmu?1h*=3L=$S+q
zji`a*c#N{*2E9fqaL5S4h9>Hh6v?`@WTg&HMvx3dtw7Wn3SD|yrV>#pbjUPTPg|WN
zPVv)N+cT_sR%}oVBqL<j<1A5$+cH_21SgwDiP>vOnw4(~Yn#0m)vQ=ZC<Y3y_PJG0
zy9E6Nk2As*E;G`{DM9b7Ando~fqnoGRU7nadG5ZEPYYiO+qnE(scJNanoC{-heQb#
zH#RjMZmYd_FQi(srD49y#CE6}EKt)HcYI@{1v+(j_XF*N4PVs%)P25JT^jKG(bLyU
zj*U-DcpkP$zAjI4=)d!4p8X)aIK&Jr^FC+1_WW&^U;3zPKlNUOSHi57?Kj2KB7460
z;-Ui^LQ-B{_jy@ZZd=H&??UYn@{J#dl#Cr66jyt(i&5L7<My=9ao((4uyh;AEPl8d
zO!M`43r^&VD$g7l+7u@N=kzD{kFHohR#!Zv_5Io6En|z$PW1jVj+n!CU`2D^ymZD9
zPB#a3oDm&=<c!|`<(O}<GccZ#Rp*Hxxmn%kt6QeO;`uBR?DP~yf<8}FBzVPhMFRGF
zRN}Z$BUX`G5OOwPS#Z84yQ}+xw^`eAdS^wAKW|sDDCYL=B|850U)8e2wy67;0)9zT
z%|?{@t>?~O*G{jdJ<Za2t9@ThrKRu$+PYqJy<??Pn{^>EH8vU^=Avr+i|X?`*2LY9
z7jHvHE29PrBH!kINN(*uSt$Oev6h7iu1N7t^Bcq8%eH4kerw;l_*m?|A2AK`y6?34
zP`@{J#lYB+FlJ}1sp{bG{!_i<tBx<Q`0hBNzXv`kMhC2pC(V1bi^?wFaH?)K)kf?Y
z@edc3r8>CO_Q1c_7CzZkyMzhv`>@qo7TfY@Gmt3uSG*tgxNWQc=v|JYQSD*fn7li5
z#PB$#i7UEVf00h?$hp1uLQj2zQtZFGsWX7jD_#?wJrFj3Z4#6Vd{fyGdK_MQaQVc!
gtQRZb>M<Y`_^PPu=gwxys^H(*kdduFq${rZ4`&KL5dZ)H

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
new file mode 100644
index 000000000..bcbb5f5c1
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
@@ -0,0 +1,27 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="@drawable/abs__list_divider_holo_light"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="end" >
+
+    <include layout="@layout/actionbar_include_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
new file mode 100644
index 000000000..8c8428e75
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
@@ -0,0 +1,29 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="@drawable/abs__list_divider_holo_light"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="middle" >
+
+    <include layout="@layout/actionbar_include_cancel_button" />
+
+    <include layout="@layout/actionbar_include_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
new file mode 100644
index 000000000..0f0521d3c
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
@@ -0,0 +1,36 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_cancel"
+    style="@style/Widget.Sherlock.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1" >
+
+    <TextView
+        android:id="@+id/actionbar_cancel_text"
+        style="@style/Widget.Sherlock.ActionBar.TabText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_action_cancel"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:text="Cancel (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
new file mode 100644
index 000000000..e14853be3
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
@@ -0,0 +1,36 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_done"
+    style="@style/Widget.Sherlock.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1" >
+
+    <TextView
+        android:id="@+id/actionbar_done_text"
+        style="@style/Widget.Sherlock.ActionBar.TabText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_action_done"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:text="Save (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
index b5e6e46ae..3157a3f09 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:padding="8dp"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent" >
 
     <fragment
         android:id="@+id/api_app_settings_fragment"
@@ -13,25 +11,4 @@
         android:layout_height="wrap_content"
         tools:layout="@layout/api_app_settings_fragment" />
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="3dip" >
-
-        <Button
-            android:id="@+id/api_app_settings_revoke"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/api_settings_revoke" />
-
-        <Button
-            android:id="@+id/api_app_settings_save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/api_settings_save" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/menu/api_app_settings.xml b/OpenPGP-Keychain/res/menu/api_app_settings.xml
new file mode 100644
index 000000000..1ee05f5de
--- /dev/null
+++ b/OpenPGP-Keychain/res/menu/api_app_settings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_api_settings_revoke"
+        android:showAsAction="never"
+        android:title="@string/api_settings_revoke"/>
+    <item
+        android:id="@+id/menu_api_settings_cancel"
+        android:showAsAction="never"
+        android:title="@string/api_settings_cancel"/>
+
+</menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index d6253ea57..5aa4081fb 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -368,6 +368,7 @@
     <string name="api_settings_no_key">No key selected</string>
     <string name="api_settings_select_key">Select key</string>
     <string name="api_settings_save">Save</string>
+    <string name="api_settings_cancel">Cancel</string>
     <string name="api_settings_revoke">Revoke access</string>
     <string name="api_register_text">%1$s (%2$s) requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
     <string name="api_register_allow">Allow access</string>
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 6316dbc38..0cfbbe3fc 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -5,7 +5,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.util.Log;
 
-import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -14,13 +13,16 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 
 public class AppSettingsActivity extends SherlockFragmentActivity {
     private PackageManager pm;
@@ -46,28 +48,36 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
         pm = getApplicationContext().getPackageManager();
 
+        // BEGIN_INCLUDE (inflate_set_custom_view)
+        // Inflate a "Done" custom action bar view to serve as the "Up" affordance.
+        final LayoutInflater inflater = (LayoutInflater) getSupportActionBar().getThemedContext()
+                .getSystemService(LAYOUT_INFLATER_SERVICE);
+        final View customActionBarView = inflater
+                .inflate(R.layout.actionbar_custom_view_done, null);
+
+        ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text))
+                .setText(R.string.api_settings_save);
+        customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener(
+                new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // "Done"
+                        save();
+                    }
+                });
+
+        // Show the custom action bar view and hide the normal Home icon and title.
+        final ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM
+                | ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE);
+        actionBar.setCustomView(customActionBarView);
+        // END_INCLUDE (inflate_set_custom_view)
+
         setContentView(R.layout.api_app_settings_activity);
 
         selectedKey = (TextView) findViewById(R.id.api_app_settings_selected_key);
         selectKeyButton = (Button) findViewById(R.id.api_app_settings_select_key_button);
         asciiArmorCheckBox = (CheckBox) findViewById(R.id.api_app_ascii_armor);
-        revokeButton = (Button) findViewById(R.id.api_app_settings_revoke);
-        saveButton = (Button) findViewById(R.id.api_app_settings_save);
-
-        revokeButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                revokeAccess();
-            }
-        });
-        saveButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                save();
-            }
-        });
 
         Intent intent = getIntent();
         appUri = intent.getData();
@@ -81,6 +91,26 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getSupportMenuInflater().inflate(R.menu.api_app_settings, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.menu_api_settings_revoke:
+            revokeAccess();
+            return true;
+        case R.id.menu_api_settings_cancel:
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private void loadData(Uri appUri) {
         Cursor cur = getContentResolver().query(appUri, null, null, null, null);
         if (cur.moveToFirst()) {
@@ -114,7 +144,6 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     }
 
     private void save() {
-        Log.d(Constants.TAG, "saving");
         final ContentValues cv = new ContentValues();
         // cv.put(KeychainContract.ApiApps.PACKAGE_NAME, packageName);
         cv.put(KeychainContract.ApiApps.ASCII_ARMOR, asciiArmorCheckBox.isChecked());

From 2b303d35583a31dfa994ca722f98446a474eb5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 08:29:56 +0200
Subject: [PATCH 19/26] select key for api apps

---
 .../layout/actionbar_include_done_button.xml  |   2 +-
 .../res/layout/api_app_settings_activity.xml  |   8 +-
 .../res/layout/api_app_settings_fragment.xml  |  61 +++++++--
 .../keychain/provider/KeychainContract.java   |   2 +-
 .../keychain/provider/KeychainDatabase.java   |   2 +-
 .../remote_api/AppSettingsActivity.java       | 123 +++++++++++++++---
 .../remote_api/AppSettingsFragment.java       |  16 ---
 7 files changed, 165 insertions(+), 49 deletions(-)

diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
index e14853be3..54e5933e3 100644
--- a/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
+++ b/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
@@ -31,6 +31,6 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:paddingRight="20dp"
-        android:text="Save (set in-code!)" />
+        android:text="Done (set in-code!)" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
index 3157a3f09..c80d767ac 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
 
     <fragment
         android:id="@+id/api_app_settings_fragment"
@@ -11,4 +13,4 @@
         android:layout_height="wrap_content"
         tools:layout="@layout/api_app_settings_fragment" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
index 6db366297..307da3efb 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
@@ -4,20 +4,38 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:gravity="center_horizontal"
         android:orientation="horizontal"
         android:paddingBottom="3dip" >
 
+        <ImageView
+            android:id="@+id/api_app_settings_app_icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="6dp"
+            android:src="@drawable/icon" />
+
         <TextView
-            android:id="@+id/api_app_settings_selected_key"
-            android:layout_width="0dip"
+            android:id="@+id/api_app_settings_app_name"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:text="@string/api_settings_no_key"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/api_app_settings_app_icon"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:text="Name (set in-code)"
             android:textAppearance="?android:attr/textAppearanceMedium" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
 
         <Button
             android:id="@+id/api_app_settings_select_key_button"
@@ -25,6 +43,33 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/api_settings_select_key" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="16dp" >
+
+            <TextView
+                android:id="@+id/api_app_settings_user_id"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="@string/api_settings_no_key"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <TextView
+                android:id="@+id/api_app_settings_user_id_rest"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text=""
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
     </LinearLayout>
 
     <Button
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
index e9637c35d..93ee50a5e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -55,7 +55,7 @@ public class KeychainContract {
 
     interface ApiAppsColumns {
         String PACKAGE_NAME = "package_name";
-        String PRIVATE_KEY_ID = "private_key_id"; // not a database id
+        String KEY_ID = "key_id"; // not a database id
         String ASCII_ARMOR = "ascii_armor";
         String ENCRYPTION_ALGORITHM = "encryption_algorithm";
         String HASH_ALORITHM = "hash_algorithm";
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index 283ab73e3..6da96f45f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -67,7 +67,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
     private static final String CREATE_API_APPS = "CREATE TABLE IF NOT EXISTS "
             + Tables.API_APPS + " (" + BaseColumns._ID
             + " INTEGER PRIMARY KEY AUTOINCREMENT, " + ApiAppsColumns.PACKAGE_NAME
-            + " TEXT UNIQUE, " + ApiAppsColumns.PRIVATE_KEY_ID + " INT64, "
+            + " TEXT UNIQUE, " + ApiAppsColumns.KEY_ID + " INT64, "
             + ApiAppsColumns.ASCII_ARMOR + " INTEGER, "
             + ApiAppsColumns.ENCRYPTION_ALGORITHM + " INTEGER, "
             + ApiAppsColumns.HASH_ALORITHM + " INTEGER, "
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 0cfbbe3fc..8d32dd3f5 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -1,8 +1,14 @@
 package org.sufficientlysecure.keychain.remote_api;
 
+import org.spongycastle.openpgp.PGPSecretKey;
+import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.ui.SelectSecretKeyActivity;
 import org.sufficientlysecure.keychain.util.Log;
 
 import android.content.ContentValues;
@@ -11,12 +17,15 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -28,15 +37,15 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     private PackageManager pm;
 
     // model
-    Uri appUri;
-    String packageName;
-    long keyId;
-
-    // model, derived
-    String appName;
+    Uri mAppUri;
+    String mPackageName;
+    long mSecretKeyId = Id.key.none;
 
     // view
-    TextView selectedKey;
+    TextView appNameView;
+    ImageView appIconView;
+    TextView keyUserId;
+    TextView keyUserIdRest;
     Button selectKeyButton;
     CheckBox asciiArmorCheckBox;
     Button saveButton;
@@ -75,19 +84,30 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
         setContentView(R.layout.api_app_settings_activity);
 
-        selectedKey = (TextView) findViewById(R.id.api_app_settings_selected_key);
+        appNameView = (TextView) findViewById(R.id.api_app_settings_app_name);
+        appIconView = (ImageView) findViewById(R.id.api_app_settings_app_icon);
+        keyUserId = (TextView) findViewById(R.id.api_app_settings_user_id);
+        keyUserIdRest = (TextView) findViewById(R.id.api_app_settings_user_id_rest);
         selectKeyButton = (Button) findViewById(R.id.api_app_settings_select_key_button);
         asciiArmorCheckBox = (CheckBox) findViewById(R.id.api_app_ascii_armor);
 
+        selectKeyButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                selectSecretKey();
+            }
+        });
+
         Intent intent = getIntent();
-        appUri = intent.getData();
-        if (appUri == null) {
+        mAppUri = intent.getData();
+        if (mAppUri == null) {
             Log.e(Constants.TAG, "Intent data missing. Should be Uri of app!");
             finish();
             return;
         } else {
-            Log.d(Constants.TAG, "uri: " + appUri);
-            loadData(appUri);
+            Log.d(Constants.TAG, "uri: " + mAppUri);
+            loadData(mAppUri);
         }
     }
 
@@ -114,18 +134,28 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     private void loadData(Uri appUri) {
         Cursor cur = getContentResolver().query(appUri, null, null, null, null);
         if (cur.moveToFirst()) {
-            packageName = cur.getString(cur.getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME));
-            // get application name
+            mPackageName = cur.getString(cur.getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME));
+
+            // get application name and icon from package manager
+            String appName = null;
+            Drawable appIcon = null;
             try {
-                ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+                ApplicationInfo ai = pm.getApplicationInfo(mPackageName, 0);
 
                 appName = (String) pm.getApplicationLabel(ai);
+                appIcon = pm.getApplicationIcon(ai);
             } catch (final NameNotFoundException e) {
                 appName = getString(R.string.api_unknown_app);
             }
-            setTitle(appName);
+            appNameView.setText(appName);
+            appIconView.setImageDrawable(appIcon);
 
             try {
+                mSecretKeyId = (cur.getLong(cur
+                        .getColumnIndexOrThrow(KeychainContract.ApiApps.KEY_ID)));
+                Log.d(Constants.TAG, "mSecretKeyId: " + mSecretKeyId);
+                updateSelectedKeyView(mSecretKeyId);
+
                 boolean asciiArmor = (cur.getInt(cur
                         .getColumnIndexOrThrow(KeychainContract.ApiApps.ASCII_ARMOR)) == 1);
                 asciiArmorCheckBox.setChecked(asciiArmor);
@@ -137,7 +167,7 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     }
 
     private void revokeAccess() {
-        if (getContentResolver().delete(appUri, null, null) <= 0) {
+        if (getContentResolver().delete(mAppUri, null, null) <= 0) {
             throw new RuntimeException();
         }
         finish();
@@ -145,14 +175,69 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
     private void save() {
         final ContentValues cv = new ContentValues();
-        // cv.put(KeychainContract.ApiApps.PACKAGE_NAME, packageName);
+        cv.put(KeychainContract.ApiApps.KEY_ID, mSecretKeyId);
+
         cv.put(KeychainContract.ApiApps.ASCII_ARMOR, asciiArmorCheckBox.isChecked());
         // TODO: other parameters
-        if (getContentResolver().update(appUri, cv, null, null) <= 0) {
+
+        if (getContentResolver().update(mAppUri, cv, null, null) <= 0) {
             throw new RuntimeException();
         }
 
         finish();
     }
 
+    private void selectSecretKey() {
+        Intent intent = new Intent(this, SelectSecretKeyActivity.class);
+        startActivityForResult(intent, Id.request.secret_keys);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+
+        case Id.request.secret_keys: {
+            if (resultCode == RESULT_OK) {
+                Bundle bundle = data.getExtras();
+                mSecretKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
+            } else {
+                mSecretKeyId = Id.key.none;
+            }
+            updateSelectedKeyView(mSecretKeyId);
+            break;
+        }
+
+        default: {
+            break;
+        }
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void updateSelectedKeyView(long secretKeyId) {
+        if (secretKeyId == Id.key.none) {
+            keyUserId.setText(R.string.api_settings_no_key);
+            keyUserIdRest.setText("");
+        } else {
+            String uid = getResources().getString(R.string.unknownUserId);
+            String uidExtra = "";
+            PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(this,
+                    secretKeyId);
+            if (keyRing != null) {
+                PGPSecretKey key = PgpHelper.getMasterKey(keyRing);
+                if (key != null) {
+                    String userId = PgpHelper.getMainUserIdSafe(this, key);
+                    String chunks[] = userId.split(" <", 2);
+                    uid = chunks[0];
+                    if (chunks.length > 1) {
+                        uidExtra = "<" + chunks[1];
+                    }
+                }
+            }
+            keyUserId.setText(uid);
+            keyUserIdRest.setText(uidExtra);
+        }
+    }
+
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
index ec983dc06..46cea389a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
@@ -21,8 +21,6 @@ public class AppSettingsFragment extends Fragment {
     private LinearLayout advancedSettingsContainer;
     private Button advancedSettingsButton;
 
-    private Button selectKeyButton;
-
     /**
      * Inflate the layout for this fragment
      */
@@ -39,8 +37,6 @@ public class AppSettingsFragment extends Fragment {
                 R.id.api_app_settings_advanced_button);
         advancedSettingsContainer = (LinearLayout) getActivity().findViewById(
                 R.id.api_app_settings_advanced);
-        selectKeyButton = (Button) getActivity().findViewById(
-                R.id.api_app_settings_select_key_button);
 
         final Animation visibleAnimation = new AlphaAnimation(0.0f, 1.0f);
         visibleAnimation.setDuration(250);
@@ -68,18 +64,6 @@ public class AppSettingsFragment extends Fragment {
                 }
             }
         });
-
-        selectKeyButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                selectSecretKey();
-            }
-        });
     }
 
-    private void selectSecretKey() {
-        Intent intent = new Intent(getActivity(), SelectSecretKeyActivity.class);
-        startActivityForResult(intent, Id.request.secret_keys);
-    }
 }

From 4030739a99a2e1ce232c6c3ab92ab21ad5bc3b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 08:40:13 +0200
Subject: [PATCH 20/26] api apps adapter with icons

---
 .../res/layout/api_apps_adapter_list_item.xml | 28 +++++++++++++++++++
 OpenPGP-Keychain/res/values/strings.xml       |  1 -
 .../remote_api/AppSettingsActivity.java       |  3 +-
 .../remote_api/RegisteredAppsAdapter.java     | 18 +++++++-----
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml

diff --git a/OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml b/OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml
new file mode 100644
index 000000000..cb20a20af
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml
@@ -0,0 +1,28 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:gravity="left"
+    android:orientation="horizontal" >
+
+    <ImageView
+        android:id="@+id/api_apps_adapter_item_icon"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:src="@drawable/icon" />
+
+    <TextView
+        android:id="@+id/api_apps_adapter_item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/api_apps_adapter_item_icon"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:text="Set in-code!"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 5aa4081fb..4165e9057 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -362,7 +362,6 @@
 
     <!-- Remote API -->
     <string name="api_no_apps">No registered applications!</string>
-    <string name="api_unknown_app">Unknown app</string>
     <string name="api_settings_show_advanced">Show advanced settings…</string>
     <string name="api_settings_hide_advanced">Hide advanced settings…</string>
     <string name="api_settings_no_key">No key selected</string>
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 8d32dd3f5..44212b5b3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -145,7 +145,8 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
                 appName = (String) pm.getApplicationLabel(ai);
                 appIcon = pm.getApplicationIcon(ai);
             } catch (final NameNotFoundException e) {
-                appName = getString(R.string.api_unknown_app);
+                // fallback
+                appName = mPackageName;
             }
             appNameView.setText(appName);
             appIconView.setImageDrawable(appIcon);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
index 71a819ec2..9bf66a90a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
@@ -28,6 +28,7 @@ import android.support.v4.widget.CursorAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 public class RegisteredAppsAdapter extends CursorAdapter {
@@ -44,28 +45,31 @@ public class RegisteredAppsAdapter extends CursorAdapter {
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-        TextView text1 = (TextView) view.findViewById(android.R.id.text1);
-        TextView text2 = (TextView) view.findViewById(android.R.id.text2);
+        TextView text = (TextView) view.findViewById(R.id.api_apps_adapter_item_name);
+        ImageView icon = (ImageView) view.findViewById(R.id.api_apps_adapter_item_icon);
 
         String packageName = cursor.getString(cursor.getColumnIndex(ApiApps.PACKAGE_NAME));
         if (packageName != null) {
-            text2.setText(packageName);
-
             // get application name
             try {
                 ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
 
-                text1.setText(pm.getApplicationLabel(ai));
+                text.setText(pm.getApplicationLabel(ai));
+                icon.setImageDrawable(pm.getApplicationIcon(ai));
             } catch (final NameNotFoundException e) {
-                text1.setText(R.string.api_unknown_app);
+                // fallback
+                text.setText(packageName);
             }
+        } else {
+            // fallback
+            text.setText(packageName);
         }
 
     }
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return mInflater.inflate(android.R.layout.simple_list_item_2, null);
+        return mInflater.inflate(R.layout.api_apps_adapter_list_item, null);
     }
 
 }

From c9549befb250826912d153d40c459fc495aa7fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 09:44:56 +0200
Subject: [PATCH 21/26] Put logic into fragment for reuse

---
 OpenPGP-Keychain/AndroidManifest.xml          |   2 +-
 .../res/layout/api_app_register_activity.xml  |  43 +----
 OpenPGP-Keychain/res/values/strings.xml       |   2 +-
 .../remote_api/AppSettingsActivity.java       | 122 ++-----------
 .../remote_api/AppSettingsFragment.java       | 171 ++++++++++++++++--
 .../keychain/remote_api/ServiceActivity.java  |  95 ++++++----
 6 files changed, 234 insertions(+), 201 deletions(-)

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 2509e1760..b5aeb2091 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -462,7 +462,7 @@
         <activity
             android:name="org.sufficientlysecure.keychain.remote_api.ServiceActivity"
             android:exported="false"
-            android:label="TODO crypto activity"
+            android:label="@string/app_name"
             android:process=":crypto" >
 
             <!-- Don't publish intents, they are only used internally! -->
diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
index da7bb16ce..40b8f54d1 100644
--- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
@@ -6,6 +6,14 @@
     android:orientation="vertical"
     android:padding="8dp" >
 
+    <TextView
+        android:id="@+id/api_register_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="3dip"
+        android:text="@string/api_register_text"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
     <fragment
         android:id="@+id/api_app_settings_fragment"
         android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
@@ -13,39 +21,4 @@
         android:layout_height="wrap_content"
         tools:layout="@layout/api_app_settings_fragment" />
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="3dip" >
-
-        <TextView
-            android:id="@+id/api_register_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TODO: use string"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingBottom="3dip" >
-
-            <Button
-                android:id="@+id/api_register_disallow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/api_register_disallow" />
-
-            <Button
-                android:id="@+id/api_register_allow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/api_register_allow" />
-        </LinearLayout>
-    </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 4165e9057..7503170a5 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -369,7 +369,7 @@
     <string name="api_settings_save">Save</string>
     <string name="api_settings_cancel">Cancel</string>
     <string name="api_settings_revoke">Revoke access</string>
-    <string name="api_register_text">%1$s (%2$s) requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
+    <string name="api_register_text">The following application requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 44212b5b3..4e069f3b0 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -1,31 +1,18 @@
 package org.sufficientlysecure.keychain.remote_api;
 
-import org.spongycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.helper.PgpHelper;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
-import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.ui.SelectSecretKeyActivity;
 import org.sufficientlysecure.keychain.util.Log;
 
 import android.content.ContentValues;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -34,28 +21,21 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
 public class AppSettingsActivity extends SherlockFragmentActivity {
-    private PackageManager pm;
-
     // model
     Uri mAppUri;
     String mPackageName;
-    long mSecretKeyId = Id.key.none;
 
     // view
-    TextView appNameView;
-    ImageView appIconView;
-    TextView keyUserId;
-    TextView keyUserIdRest;
-    Button selectKeyButton;
-    CheckBox asciiArmorCheckBox;
     Button saveButton;
     Button revokeButton;
 
+    AppSettingsFragment settingsFragment;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        pm = getApplicationContext().getPackageManager();
+        // pm = getApplicationContext().getPackageManager();
 
         // BEGIN_INCLUDE (inflate_set_custom_view)
         // Inflate a "Done" custom action bar view to serve as the "Up" affordance.
@@ -84,20 +64,8 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
         setContentView(R.layout.api_app_settings_activity);
 
-        appNameView = (TextView) findViewById(R.id.api_app_settings_app_name);
-        appIconView = (ImageView) findViewById(R.id.api_app_settings_app_icon);
-        keyUserId = (TextView) findViewById(R.id.api_app_settings_user_id);
-        keyUserIdRest = (TextView) findViewById(R.id.api_app_settings_user_id_rest);
-        selectKeyButton = (Button) findViewById(R.id.api_app_settings_select_key_button);
-        asciiArmorCheckBox = (CheckBox) findViewById(R.id.api_app_ascii_armor);
-
-        selectKeyButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                selectSecretKey();
-            }
-        });
+        settingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
+                R.id.api_app_settings_fragment);
 
         Intent intent = getIntent();
         mAppUri = intent.getData();
@@ -136,30 +104,17 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
         if (cur.moveToFirst()) {
             mPackageName = cur.getString(cur.getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME));
 
-            // get application name and icon from package manager
-            String appName = null;
-            Drawable appIcon = null;
-            try {
-                ApplicationInfo ai = pm.getApplicationInfo(mPackageName, 0);
-
-                appName = (String) pm.getApplicationLabel(ai);
-                appIcon = pm.getApplicationIcon(ai);
-            } catch (final NameNotFoundException e) {
-                // fallback
-                appName = mPackageName;
-            }
-            appNameView.setText(appName);
-            appIconView.setImageDrawable(appIcon);
+            settingsFragment.setPackage(mPackageName);
 
             try {
-                mSecretKeyId = (cur.getLong(cur
+                long secretKeyId = (cur.getLong(cur
                         .getColumnIndexOrThrow(KeychainContract.ApiApps.KEY_ID)));
-                Log.d(Constants.TAG, "mSecretKeyId: " + mSecretKeyId);
-                updateSelectedKeyView(mSecretKeyId);
+                Log.d(Constants.TAG, "mSecretKeyId: " + secretKeyId);
+                settingsFragment.setSecretKey(secretKeyId);
 
                 boolean asciiArmor = (cur.getInt(cur
                         .getColumnIndexOrThrow(KeychainContract.ApiApps.ASCII_ARMOR)) == 1);
-                asciiArmorCheckBox.setChecked(asciiArmor);
+                settingsFragment.setAsciiArmor(asciiArmor);
 
             } catch (IllegalArgumentException e) {
                 Log.e(Constants.TAG, "AppSettingsActivity", e);
@@ -176,9 +131,9 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
     private void save() {
         final ContentValues cv = new ContentValues();
-        cv.put(KeychainContract.ApiApps.KEY_ID, mSecretKeyId);
+        cv.put(KeychainContract.ApiApps.KEY_ID, settingsFragment.getSecretKeyId());
 
-        cv.put(KeychainContract.ApiApps.ASCII_ARMOR, asciiArmorCheckBox.isChecked());
+        cv.put(KeychainContract.ApiApps.ASCII_ARMOR, settingsFragment.isAsciiArmor());
         // TODO: other parameters
 
         if (getContentResolver().update(mAppUri, cv, null, null) <= 0) {
@@ -188,57 +143,4 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
         finish();
     }
 
-    private void selectSecretKey() {
-        Intent intent = new Intent(this, SelectSecretKeyActivity.class);
-        startActivityForResult(intent, Id.request.secret_keys);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-
-        case Id.request.secret_keys: {
-            if (resultCode == RESULT_OK) {
-                Bundle bundle = data.getExtras();
-                mSecretKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
-            } else {
-                mSecretKeyId = Id.key.none;
-            }
-            updateSelectedKeyView(mSecretKeyId);
-            break;
-        }
-
-        default: {
-            break;
-        }
-        }
-
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    private void updateSelectedKeyView(long secretKeyId) {
-        if (secretKeyId == Id.key.none) {
-            keyUserId.setText(R.string.api_settings_no_key);
-            keyUserIdRest.setText("");
-        } else {
-            String uid = getResources().getString(R.string.unknownUserId);
-            String uidExtra = "";
-            PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(this,
-                    secretKeyId);
-            if (keyRing != null) {
-                PGPSecretKey key = PgpHelper.getMasterKey(keyRing);
-                if (key != null) {
-                    String userId = PgpHelper.getMainUserIdSafe(this, key);
-                    String chunks[] = userId.split(" <", 2);
-                    uid = chunks[0];
-                    if (chunks.length > 1) {
-                        uidExtra = "<" + chunks[1];
-                    }
-                }
-            }
-            keyUserId.setText(uid);
-            keyUserIdRest.setText(uidExtra);
-        }
-    }
-
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
index 46cea389a..69d4e68ea 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
@@ -1,10 +1,21 @@
 package org.sufficientlysecure.keychain.remote_api;
 
+import org.spongycastle.openpgp.PGPSecretKey;
+import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.SelectSecretKeyActivity;
+import org.sufficientlysecure.keychain.util.Log;
 
+import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -14,29 +25,72 @@ import android.view.ViewGroup;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 public class AppSettingsFragment extends Fragment {
 
-    private LinearLayout advancedSettingsContainer;
-    private Button advancedSettingsButton;
+    // model
+    private long mSecretKeyId = Id.key.none;
+
+    // view
+    private LinearLayout mAdvancedSettingsContainer;
+    private Button mAdvancedSettingsButton;
+    private TextView mAppNameView;
+    private ImageView mAppIconView;
+    private TextView mKeyUserId;
+    private TextView mKeyUserIdRest;
+    private Button mSelectKeyButton;
+    private CheckBox mAsciiArmorCheckBox;
+
+    public void setSecretKey(long keyId) {
+        mSecretKeyId = keyId;
+        updateSelectedKeyView(keyId);
+    }
+
+    public long getSecretKeyId() {
+        return mSecretKeyId;
+    }
+
+    public void setAsciiArmor(boolean value) {
+        mAsciiArmorCheckBox.setChecked(value);
+    }
+
+    public boolean isAsciiArmor() {
+        return mAsciiArmorCheckBox.isChecked();
+    }
 
     /**
      * Inflate the layout for this fragment
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.api_app_settings_fragment, container, false);
+        View view = inflater.inflate(R.layout.api_app_settings_fragment, container, false);
+        initView(view);
+        return view;
     }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    private void initView(View view) {
+        mAdvancedSettingsButton = (Button) view.findViewById(R.id.api_app_settings_advanced_button);
+        mAdvancedSettingsContainer = (LinearLayout) view
+                .findViewById(R.id.api_app_settings_advanced);
 
-        advancedSettingsButton = (Button) getActivity().findViewById(
-                R.id.api_app_settings_advanced_button);
-        advancedSettingsContainer = (LinearLayout) getActivity().findViewById(
-                R.id.api_app_settings_advanced);
+        mAppNameView = (TextView) view.findViewById(R.id.api_app_settings_app_name);
+        mAppIconView = (ImageView) view.findViewById(R.id.api_app_settings_app_icon);
+        mKeyUserId = (TextView) view.findViewById(R.id.api_app_settings_user_id);
+        mKeyUserIdRest = (TextView) view.findViewById(R.id.api_app_settings_user_id_rest);
+        mSelectKeyButton = (Button) view.findViewById(R.id.api_app_settings_select_key_button);
+        mAsciiArmorCheckBox = (CheckBox) view.findViewById(R.id.api_app_ascii_armor);
+
+        mSelectKeyButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                selectSecretKey();
+            }
+        });
 
         final Animation visibleAnimation = new AlphaAnimation(0.0f, 1.0f);
         visibleAnimation.setDuration(250);
@@ -49,21 +103,102 @@ public class AppSettingsFragment extends Fragment {
         // Animation.RELATIVE_TO_SELF, 0.0f);
         // animation2.setDuration(150);
 
-        advancedSettingsButton.setOnClickListener(new OnClickListener() {
+        mAdvancedSettingsButton.setOnClickListener(new OnClickListener() {
 
             @Override
             public void onClick(View v) {
-                if (advancedSettingsContainer.getVisibility() == View.VISIBLE) {
-                    advancedSettingsContainer.startAnimation(invisibleAnimation);
-                    advancedSettingsContainer.setVisibility(View.INVISIBLE);
-                    advancedSettingsButton.setText(R.string.api_settings_show_advanced);
+                if (mAdvancedSettingsContainer.getVisibility() == View.VISIBLE) {
+                    mAdvancedSettingsContainer.startAnimation(invisibleAnimation);
+                    mAdvancedSettingsContainer.setVisibility(View.INVISIBLE);
+                    mAdvancedSettingsButton.setText(R.string.api_settings_show_advanced);
                 } else {
-                    advancedSettingsContainer.startAnimation(visibleAnimation);
-                    advancedSettingsContainer.setVisibility(View.VISIBLE);
-                    advancedSettingsButton.setText(R.string.api_settings_hide_advanced);
+                    mAdvancedSettingsContainer.startAnimation(visibleAnimation);
+                    mAdvancedSettingsContainer.setVisibility(View.VISIBLE);
+                    mAdvancedSettingsButton.setText(R.string.api_settings_hide_advanced);
                 }
             }
         });
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+    }
+
+    private void selectSecretKey() {
+        Intent intent = new Intent(getActivity(), SelectSecretKeyActivity.class);
+        startActivityForResult(intent, Id.request.secret_keys);
+    }
+
+    public void setPackage(String packageName) {
+        PackageManager pm = getActivity().getApplicationContext().getPackageManager();
+
+        // get application name and icon from package manager
+        String appName = null;
+        Drawable appIcon = null;
+        try {
+            ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+
+            appName = (String) pm.getApplicationLabel(ai);
+            appIcon = pm.getApplicationIcon(ai);
+        } catch (final NameNotFoundException e) {
+            // fallback
+            appName = packageName;
+        }
+        mAppNameView.setText(appName);
+        mAppIconView.setImageDrawable(appIcon);
+    }
+
+    private void updateSelectedKeyView(long secretKeyId) {
+        if (secretKeyId == Id.key.none) {
+            mKeyUserId.setText(R.string.api_settings_no_key);
+            mKeyUserIdRest.setText("");
+        } else {
+            String uid = getResources().getString(R.string.unknownUserId);
+            String uidExtra = "";
+            PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(
+                    getActivity(), secretKeyId);
+            if (keyRing != null) {
+                PGPSecretKey key = PgpHelper.getMasterKey(keyRing);
+                if (key != null) {
+                    String userId = PgpHelper.getMainUserIdSafe(getActivity(), key);
+                    String chunks[] = userId.split(" <", 2);
+                    uid = chunks[0];
+                    if (chunks.length > 1) {
+                        uidExtra = "<" + chunks[1];
+                    }
+                }
+            }
+            mKeyUserId.setText(uid);
+            mKeyUserIdRest.setText(uidExtra);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Log.d(Constants.TAG, "onactivityresult     " + requestCode + "   " + resultCode);
+        switch (requestCode) {
+
+        case Id.request.secret_keys: {
+            if (resultCode == Activity.RESULT_OK) {
+                Bundle bundle = data.getExtras();
+                mSecretKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
+                Log.d(Constants.TAG, "jo " + mSecretKeyId);
+
+            } else {
+                mSecretKeyId = Id.key.none;
+            }
+            updateSelectedKeyView(mSecretKeyId);
+            break;
+        }
+
+        default: {
+            break;
+        }
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 00bba7757..5f36075f5 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -16,8 +16,6 @@
 
 package org.sufficientlysecure.keychain.remote_api;
 
-import java.util.ArrayList;
-
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
@@ -26,6 +24,7 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
+import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 import android.content.ComponentName;
@@ -38,10 +37,10 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
+import android.view.ViewGroup;
+import android.widget.TextView;
 
 public class ServiceActivity extends SherlockFragmentActivity {
 
@@ -133,8 +132,63 @@ public class ServiceActivity extends SherlockFragmentActivity {
         if (ACTION_REGISTER.equals(action)) {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
 
+            // BEGIN_INCLUDE (inflate_set_custom_view)
+            // Inflate a "Done"/"Cancel" custom action bar view
+            final LayoutInflater inflater = (LayoutInflater) getSupportActionBar()
+                    .getThemedContext().getSystemService(LAYOUT_INFLATER_SERVICE);
+            final View customActionBarView = inflater.inflate(
+                    R.layout.actionbar_custom_view_done_cancel, null);
+
+            ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text))
+                    .setText(R.string.api_register_allow);
+            customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener(
+                    new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            // Allow
+                            ProviderHelper.addCryptoConsumer(ServiceActivity.this, packageName);
+                            // Intent data = new Intent();
+
+                            try {
+                                mServiceCallback.onRegistered(true, packageName);
+                            } catch (RemoteException e) {
+                                Log.e(Constants.TAG, "ServiceActivity");
+                            }
+                            finish();
+                        }
+                    });
+            ((TextView) customActionBarView.findViewById(R.id.actionbar_cancel_text))
+                    .setText(R.string.api_register_disallow);
+            customActionBarView.findViewById(R.id.actionbar_cancel).setOnClickListener(
+                    new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            // Disallow
+                            try {
+                                mServiceCallback.onRegistered(false, packageName);
+                            } catch (RemoteException e) {
+                                Log.e(Constants.TAG, "ServiceActivity");
+                            }
+                            finish();
+                        }
+                    });
+
+            // Show the custom action bar view and hide the normal Home icon and title.
+            final ActionBar actionBar = getSupportActionBar();
+            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_SHOW_HOME
+                            | ActionBar.DISPLAY_SHOW_TITLE);
+            actionBar.setCustomView(customActionBarView, new ActionBar.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            // END_INCLUDE (inflate_set_custom_view)
+
             setContentView(R.layout.api_app_register_activity);
 
+            AppSettingsFragment settingsFragment = (AppSettingsFragment) getSupportFragmentManager()
+                    .findFragmentById(R.id.api_app_settings_fragment);
+            
+            settingsFragment.setPackage(packageName);
+
             // TODO: handle if app is already registered
             // LinearLayout layoutRegister = (LinearLayout)
             // findViewById(R.id.register_crypto_consumer_register_layout);
@@ -152,37 +206,6 @@ public class ServiceActivity extends SherlockFragmentActivity {
             // layoutEdit.setVisibility(View.GONE);
             // }
 
-            Button allowButton = (Button) findViewById(R.id.api_register_allow);
-            Button disallowButton = (Button) findViewById(R.id.api_register_disallow);
-
-            allowButton.setOnClickListener(new OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    ProviderHelper.addCryptoConsumer(ServiceActivity.this, packageName);
-                    // Intent data = new Intent();
-
-                    try {
-                        mServiceCallback.onRegistered(true, packageName);
-                    } catch (RemoteException e) {
-                        Log.e(Constants.TAG, "ServiceActivity");
-                    }
-                    finish();
-                }
-            });
-
-            disallowButton.setOnClickListener(new OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    try {
-                        mServiceCallback.onRegistered(false, packageName);
-                    } catch (RemoteException e) {
-                        Log.e(Constants.TAG, "ServiceActivity");
-                    }
-                    finish();
-                }
-            });
         } else if (ACTION_CACHE_PASSPHRASE.equals(action)) {
             long secretKeyId = extras.getLong(EXTRA_SECRET_KEY_ID);
 

From c97c57d34ea1994312ad7e409042ec55cf27c1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 10:03:25 +0200
Subject: [PATCH 22/26] remove dead code

---
 OpenPGP-Keychain/res/values/strings.xml       |  3 +-
 .../remote_api/AppSettingsActivity.java       | 15 ++-----
 .../keychain/remote_api/ServiceActivity.java  | 41 +++++++++++--------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 7503170a5..bcae942aa 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -372,5 +372,6 @@
     <string name="api_register_text">The following application requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
-
+    <string name="api_register_error_select_key">Please select a key!</string>
+    
 </resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 4e069f3b0..55fa72b0e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -12,7 +12,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -22,22 +21,15 @@ import com.actionbarsherlock.view.MenuItem;
 
 public class AppSettingsActivity extends SherlockFragmentActivity {
     // model
-    Uri mAppUri;
-    String mPackageName;
+    private Uri mAppUri;
+    private String mPackageName;
 
-    // view
-    Button saveButton;
-    Button revokeButton;
-
-    AppSettingsFragment settingsFragment;
+    private AppSettingsFragment settingsFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // pm = getApplicationContext().getPackageManager();
-
-        // BEGIN_INCLUDE (inflate_set_custom_view)
         // Inflate a "Done" custom action bar view to serve as the "Up" affordance.
         final LayoutInflater inflater = (LayoutInflater) getSupportActionBar().getThemedContext()
                 .getSystemService(LAYOUT_INFLATER_SERVICE);
@@ -60,7 +52,6 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
         actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM
                 | ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE);
         actionBar.setCustomView(customActionBarView);
-        // END_INCLUDE (inflate_set_custom_view)
 
         setContentView(R.layout.api_app_settings_activity);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 5f36075f5..422026a19 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -17,16 +17,13 @@
 package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
 import org.sufficientlysecure.keychain.helper.PgpMain;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -41,6 +38,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 public class ServiceActivity extends SherlockFragmentActivity {
 
@@ -53,6 +54,9 @@ public class ServiceActivity extends SherlockFragmentActivity {
     private IServiceActivityCallback mServiceCallback;
     private boolean mServiceBound;
 
+    // view
+    AppSettingsFragment settingsFragment;
+
     private ServiceConnection mServiceActivityConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName name, IBinder service) {
             mServiceCallback = IServiceActivityCallback.Stub.asInterface(service);
@@ -132,7 +136,6 @@ public class ServiceActivity extends SherlockFragmentActivity {
         if (ACTION_REGISTER.equals(action)) {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
 
-            // BEGIN_INCLUDE (inflate_set_custom_view)
             // Inflate a "Done"/"Cancel" custom action bar view
             final LayoutInflater inflater = (LayoutInflater) getSupportActionBar()
                     .getThemedContext().getSystemService(LAYOUT_INFLATER_SERVICE);
@@ -146,15 +149,22 @@ public class ServiceActivity extends SherlockFragmentActivity {
                         @Override
                         public void onClick(View v) {
                             // Allow
-                            ProviderHelper.addCryptoConsumer(ServiceActivity.this, packageName);
-                            // Intent data = new Intent();
 
-                            try {
-                                mServiceCallback.onRegistered(true, packageName);
-                            } catch (RemoteException e) {
-                                Log.e(Constants.TAG, "ServiceActivity");
+                            if (settingsFragment.getSecretKeyId() == Id.key.none) {
+                                Toast.makeText(ServiceActivity.this,
+                                        R.string.api_register_error_select_key, Toast.LENGTH_LONG)
+                                        .show();
+                            } else {
+                                ProviderHelper.addCryptoConsumer(ServiceActivity.this, packageName);
+                                // Intent data = new Intent();
+
+                                try {
+                                    mServiceCallback.onRegistered(true, packageName);
+                                } catch (RemoteException e) {
+                                    Log.e(Constants.TAG, "ServiceActivity");
+                                }
+                                finish();
                             }
-                            finish();
                         }
                     });
             ((TextView) customActionBarView.findViewById(R.id.actionbar_cancel_text))
@@ -180,13 +190,12 @@ public class ServiceActivity extends SherlockFragmentActivity {
                             | ActionBar.DISPLAY_SHOW_TITLE);
             actionBar.setCustomView(customActionBarView, new ActionBar.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-            // END_INCLUDE (inflate_set_custom_view)
 
             setContentView(R.layout.api_app_register_activity);
 
-            AppSettingsFragment settingsFragment = (AppSettingsFragment) getSupportFragmentManager()
-                    .findFragmentById(R.id.api_app_settings_fragment);
-            
+            settingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
+                    R.id.api_app_settings_fragment);
+
             settingsFragment.setPackage(packageName);
 
             // TODO: handle if app is already registered

From dc6a709b7a8f3b80039c7de40050b9f2f3f42dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 11:24:28 +0200
Subject: [PATCH 23/26] Disable parts of the old API

---
 API.md                                        |  34 +++++
 OLD_API.md                                    |  68 ++++++++++
 OpenPGP-Keychain/AndroidManifest.xml          | 116 ++++++++++--------
 .../keychain/helper/OtherHelper.java          |  45 ++++---
 .../keychain/provider/KeychainProvider.java   |  12 +-
 .../RegisteredAppsListFragment.java           |   8 +-
 README.md                                     |  66 ----------
 7 files changed, 201 insertions(+), 148 deletions(-)
 create mode 100644 API.md
 create mode 100644 OLD_API.md

diff --git a/API.md b/API.md
new file mode 100644
index 000000000..80c270840
--- /dev/null
+++ b/API.md
@@ -0,0 +1,34 @@
+# Security Model
+
+## Basic goals
+
+* Intents without permissions should only work based on user interaction (e.g. click a button in a dialog)
+
+Android primitives to exchange data: Intent, Intent with return values, Send (also an Intent), Content Provider, AIDL
+
+## Without Permissions
+
+### Intents
+All Intents start with ``org.sufficientlysecure.keychain.action.``
+
+* ``android.intent.action.VIEW`` connected to .gpg and .asc files: Import Key and Decrypt
+* ``android.intent.action.SEND connected to all mime types (text/plain and every binary data like files and images): Encrypt and Decrypt
+* ``IMPORT``
+* ``IMPORT_FROM_FILE``
+* ``IMPORT_FROM_QR_CODE``
+* ``IMPORT_FROM_NFC``
+* ``SHARE_KEYRING``
+* ``SHARE_KEYRING_WITH_QR_CODE``
+* ``SHARE_KEYRING_WITH_NFC``
+* ``EDIT_KEYRING``
+* ``SELECT_PUBLIC_KEYRINGS``
+* ``SELECT_SECRET_KEYRING``
+* ``ENCRYPT``
+* ``ENCRYPT_FILE``
+* ``DECRYPT``
+* ``DECRYPT_FILE``
+
+TODO:
+- remove IMPORT, SHARE intents, simplify ENCRYPT and DECRYPT intents (include _FILE derivates like done in SEND based on file type)
+- EDIT_KEYRING and CREATE_KEYRING, should be available via for registered apps
+- new intent REGISTER_APP?
\ No newline at end of file
diff --git a/OLD_API.md b/OLD_API.md
new file mode 100644
index 000000000..1a9bab0a7
--- /dev/null
+++ b/OLD_API.md
@@ -0,0 +1,68 @@
+This is the old API. Currently disabled!
+
+# Security Model
+
+## Basic goals
+
+* Intents without permissions should only work based on user interaction (e.g. click a button in a dialog)
+
+Android primitives to exchange data: Intent, Intent with return values, Send (also an Intent), Content Provider, AIDL
+
+## Possible Permissions
+
+* ACCESS_API: Encrypt/Sign/Decrypt/Create keys without user interaction (intents, remote service), Read key information (not the actual keys)(content provider)
+* ACCESS_KEYS: get and import actual public and secret keys (remote service)
+
+
+## Without Permissions
+
+### Intents
+All Intents start with org.sufficientlysecure.keychain.action.
+
+* android.intent.action.VIEW connected to .gpg and .asc files: Import Key and Decrypt
+* android.intent.action.SEND connected to all mime types (text/plain and every binary data like files and images): Encrypt and Decrypt
+* IMPORT
+* IMPORT_FROM_FILE
+* IMPORT_FROM_QR_CODE
+* IMPORT_FROM_NFC
+* SHARE_KEYRING
+* SHARE_KEYRING_WITH_QR_CODE
+* SHARE_KEYRING_WITH_NFC
+* EDIT_KEYRING
+* SELECT_PUBLIC_KEYRINGS
+* SELECT_SECRET_KEYRING
+* ENCRYPT
+* ENCRYPT_FILE
+* DECRYPT
+* DECRYPT_FILE
+
+## With permission ACCESS_API
+
+### Intents
+
+* CREATE_KEYRING
+* ENCRYPT_AND_RETURN
+* ENCRYPT_STREAM_AND_RETURN
+* GENERATE_SIGNATURE_AND_RETURN
+* DECRYPT_AND_RETURN
+* DECRYPT_STREAM_AND_RETURN
+
+### Broadcast Receiver
+On change of database the following broadcast is send.
+* DATABASE_CHANGE
+
+### Content Provider
+
+* The whole content provider requires a permission (only read)
+* Don't give out blobs (keys can be accessed by ACCESS_KEYS via remote service)
+* Make an internal and external content provider (or pathes with <path-permission>)
+* Look at android:grantUriPermissions especially for ApgServiceBlobProvider
+* Only give out android:readPermission
+
+### ApgApiService (Remote Service)
+AIDL service
+
+## With permission ACCESS_KEYS
+
+### ApgKeyService (Remote Service)
+AIDL service to access actual private keyring objects
\ No newline at end of file
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index b5aeb2091..c975d0357 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -67,24 +67,27 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" />
 
-    <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" />
+    <!-- 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" /> -->
 
-    <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
@@ -412,50 +415,57 @@
             android:exported="false"
             android:process=":passphrase_cache" />
         <service android:name="org.sufficientlysecure.keychain.service.KeychainIntentService" />
-        <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>
 
-            <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>
+        <!-- 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> -->
 
-            <meta-data
-                android:name="api_version"
-                android:value="3" />
-        </service>
+
+        <!-- <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.KeychainProviderInternal"
             android:authorities="org.sufficientlysecure.keychain.internal"
             android:exported="false" />
-        <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: 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! -->
-        <provider
-            android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider"
-            android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider"
-            android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
+        <!-- <provider -->
+        <!-- android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider" -->
+        <!-- android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider" -->
+        <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> -->
+
 
         <!-- Remote API internal intents -->
 
@@ -486,6 +496,8 @@
             android:process=":crypto" >
             <intent-filter>
                 <action android:name="org.openintents.crypto.ICryptoService" />
+            </intent-filter>
+            <intent-filter>
 
                 <!-- Can only be used from OpenPGP Keychain (internal): -->
                 <action android:name="org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback" />
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
index 6a71ca0ba..e38b1b726 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
@@ -122,26 +122,31 @@ public class OtherHelper {
         if (action != null) {
             PackageManager pkgManager = activity.getPackageManager();
 
-            for (int i = 0; i < restrictedActions.length; i++) {
-                if (restrictedActions[i].equals(action)) {
-                    if (pkgName != null
-                            && (pkgManager.checkPermission(permName, pkgName) == PackageManager.PERMISSION_GRANTED || pkgName
-                                    .equals(Constants.PACKAGE_NAME))) {
-                        Log.d(Constants.TAG, pkgName + " has permission " + permName + ". Action "
-                                + action + " was granted!");
-                    } else {
-                        String error = pkgName + " does NOT have permission " + permName
-                                + ". Action " + action + " was NOT granted!";
-                        Log.e(Constants.TAG, error);
-                        Toast.makeText(activity, activity.getString(R.string.errorMessage, error),
-                                Toast.LENGTH_LONG).show();
-
-                        // end activity
-                        activity.setResult(Activity.RESULT_CANCELED, null);
-                        activity.finish();
-                    }
-                }
-            }
+//            for (int i = 0; i < restrictedActions.length; i++) {
+//                if (restrictedActions[i].equals(action)) {
+//                    if (pkgName != null
+//                            && (pkgManager.checkPermission(permName, pkgName) == PackageManager.PERMISSION_GRANTED || pkgName
+//                                    .equals(Constants.PACKAGE_NAME))) {
+//                        Log.d(Constants.TAG, pkgName + " has permission " + permName + ". Action "
+//                                + action + " was granted!");
+//                    } else {
+//                        String error = pkgName + " does NOT have permission " + permName
+//                                + ". Action " + action + " was NOT granted!";
+//                        Log.e(Constants.TAG, error);
+//                        Toast.makeText(activity, activity.getString(R.string.errorMessage, error),
+//                                Toast.LENGTH_LONG).show();
+//
+//                        // end activity
+//                        activity.setResult(Activity.RESULT_CANCELED, null);
+//                        activity.finish();
+//                    }
+//                }
+//            }
+            
+            // TODO: currently always cancels! THis is the old API
+            // end activity
+            activity.setResult(Activity.RESULT_CANCELED, null);
+            activity.finish();
         }
     }
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 98a45d69f..edb82e632 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -973,10 +973,12 @@ public class KeychainProvider extends ContentProvider {
      * updated, or deleted
      */
     private void sendBroadcastDatabaseChange(int keyType, String contentItemType) {
-        Intent intent = new Intent();
-        intent.setAction(ACTION_BROADCAST_DATABASE_CHANGE);
-        intent.putExtra(EXTRA_BROADCAST_KEY_TYPE, keyType);
-        intent.putExtra(EXTRA_BROADCAST_CONTENT_ITEM_TYPE, contentItemType);
-        getContext().sendBroadcast(intent, Constants.PERMISSION_ACCESS_API);
+        // TODO: Disabled, old API
+        // Intent intent = new Intent();
+        // intent.setAction(ACTION_BROADCAST_DATABASE_CHANGE);
+        // intent.putExtra(EXTRA_BROADCAST_KEY_TYPE, keyType);
+        // intent.putExtra(EXTRA_BROADCAST_CONTENT_ITEM_TYPE, contentItemType);
+        //
+        // getContext().sendBroadcast(intent, Constants.PERMISSION_ACCESS_API);
     }
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
index 5ab210d5f..d1e52a2d6 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
@@ -4,8 +4,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
 
-import com.actionbarsherlock.app.SherlockListFragment;
-
 import android.content.ContentUris;
 import android.content.Intent;
 import android.database.Cursor;
@@ -17,7 +15,8 @@ import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
+
+import com.actionbarsherlock.app.SherlockListFragment;
 
 public class RegisteredAppsListFragment extends SherlockListFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
@@ -37,8 +36,7 @@ public class RegisteredAppsListFragment extends SherlockListFragment implements
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
                 // edit app settings
                 Intent intent = new Intent(getActivity(), AppSettingsActivity.class);
-                intent.setData(ContentUris.withAppendedId(
-                        KeychainContract.ApiApps.CONTENT_URI, id));
+                intent.setData(ContentUris.withAppendedId(KeychainContract.ApiApps.CONTENT_URI, id));
                 startActivity(intent);
             }
         });
diff --git a/README.md b/README.md
index 30a4fbf3d..bdad56c91 100644
--- a/README.md
+++ b/README.md
@@ -68,72 +68,6 @@ See http://docs.oseems.com/general/application/eclipse/fix-gc-overhead-limit-exc
 1. Open svg file in Inkscape
 2. Extensions -> Color -> darker (2 times!)
 
-# Security Model
-
-## Basic goals
-
-* Intents without permissions should only work based on user interaction (e.g. click a button in a dialog)
-
-Android primitives to exchange data: Intent, Intent with return values, Send (also an Intent), Content Provider, AIDL
-
-## Possible Permissions
-
-* ACCESS_API: Encrypt/Sign/Decrypt/Create keys without user interaction (intents, remote service), Read key information (not the actual keys)(content provider)
-* ACCESS_KEYS: get and import actual public and secret keys (remote service)
-
-## Without Permissions
-
-### Intents
-All Intents start with org.sufficientlysecure.keychain.action.
-
-* android.intent.action.VIEW connected to .gpg and .asc files: Import Key and Decrypt
-* android.intent.action.SEND connected to all mime types (text/plain and every binary data like files and images): Encrypt and Decrypt
-* IMPORT
-* IMPORT_FROM_FILE
-* IMPORT_FROM_QR_CODE
-* IMPORT_FROM_NFC
-* SHARE_KEYRING
-* SHARE_KEYRING_WITH_QR_CODE
-* SHARE_KEYRING_WITH_NFC
-* EDIT_KEYRING
-* SELECT_PUBLIC_KEYRINGS
-* SELECT_SECRET_KEYRING
-* ENCRYPT
-* ENCRYPT_FILE
-* DECRYPT
-* DECRYPT_FILE
-
-## With permission ACCESS_API
-
-### Intents
-
-* CREATE_KEYRING
-* ENCRYPT_AND_RETURN
-* ENCRYPT_STREAM_AND_RETURN
-* GENERATE_SIGNATURE_AND_RETURN
-* DECRYPT_AND_RETURN
-* DECRYPT_STREAM_AND_RETURN
-
-### Broadcast Receiver
-On change of database the following broadcast is send.
-* DATABASE_CHANGE
-
-### Content Provider
-
-* The whole content provider requires a permission (only read)
-* Don't give out blobs (keys can be accessed by ACCESS_KEYS via remote service)
-* Make an internal and external content provider (or pathes with <path-permission>)
-* Look at android:grantUriPermissions especially for ApgServiceBlobProvider
-* Only give out android:readPermission
-
-### ApgApiService (Remote Service)
-AIDL service
-
-## With permission ACCESS_KEYS
-
-### ApgKeyService (Remote Service)
-AIDL service to access actual private keyring objects
-
 # Licenses
 OpenPGP Kechain is licensed under Apache License v2.
 

From 1beb85acf5d4900a9cc558d077b0df4ed6c683c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 11:55:08 +0200
Subject: [PATCH 24/26] Register works basically

---
 .../res/layout/crypto_provider_demo.xml       | 13 -------
 .../demo/CryptoProviderDemoActivity.java      |  3 +-
 OpenPGP-Keychain/AndroidManifest.xml          |  2 +-
 .../keychain/helper/OtherHelper.java          |  2 +-
 .../keychain/provider/ProviderHelper.java     | 11 ++++--
 .../keychain/remote_api/CryptoService.java    | 39 ++++++++++++-------
 ...tivity.java => CryptoServiceActivity.java} | 11 ++++--
 7 files changed, 41 insertions(+), 40 deletions(-)
 rename OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/{ServiceActivity.java => CryptoServiceActivity.java} (95%)

diff --git a/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
index e4c9e1441..af1e345d6 100644
--- a/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
+++ b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
@@ -21,19 +21,6 @@
             android:text="dominik@dominikschuermann.de"
             android:textAppearance="@android:style/TextAppearance.Small" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Sign User Id"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <EditText
-            android:id="@+id/crypto_provider_demo_sign_user_id"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="dominik@dominikschuermann.de"
-            android:textAppearance="@android:style/TextAppearance.Small" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
index a82c44c6a..7dcd7c66f 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -63,7 +63,6 @@ public class CryptoProviderDemoActivity extends Activity {
         mMessage = (EditText) findViewById(R.id.crypto_provider_demo_message);
         mCiphertext = (EditText) findViewById(R.id.crypto_provider_demo_ciphertext);
         mEncryptUserId = (EditText) findViewById(R.id.crypto_provider_demo_encrypt_user_id);
-        mSignUserId = (EditText) findViewById(R.id.crypto_provider_demo_sign_user_id);
 
         selectCryptoProvider();
     }
@@ -88,7 +87,7 @@ public class CryptoProviderDemoActivity extends Activity {
         }
 
     };
-    
+
     final ICryptoCallback.Stub decryptCallback = new ICryptoCallback.Stub() {
 
         @Override
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index c975d0357..6de9221ca 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -470,7 +470,7 @@
         <!-- Remote API internal intents -->
 
         <activity
-            android:name="org.sufficientlysecure.keychain.remote_api.ServiceActivity"
+            android:name="org.sufficientlysecure.keychain.remote_api.CryptoServiceActivity"
             android:exported="false"
             android:label="@string/app_name"
             android:process=":crypto" >
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
index e38b1b726..5dc561923 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
@@ -120,7 +120,7 @@ public class OtherHelper {
     public static void checkPackagePermissionForActions(Activity activity, String pkgName,
             String permName, String action, String[] restrictedActions) {
         if (action != null) {
-            PackageManager pkgManager = activity.getPackageManager();
+//            PackageManager pkgManager = activity.getPackageManager();
 
 //            for (int i = 0; i < restrictedActions.length; i++) {
 //                if (restrictedActions[i].equals(action)) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index c8f9baeff..60aa0542e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -718,9 +718,9 @@ public class ProviderHelper {
         return cursor;
     }
 
-    public static ArrayList<String> getCryptoConsumers(Context context) {
-        Cursor cursor = context.getContentResolver().query(ApiApps.CONTENT_URI, null, null,
-                null, null);
+    public static ArrayList<String> getRegisteredApiApps(Context context) {
+        Cursor cursor = context.getContentResolver().query(ApiApps.CONTENT_URI, null, null, null,
+                null);
 
         ArrayList<String> packageNames = new ArrayList<String>();
         if (cursor != null) {
@@ -739,9 +739,12 @@ public class ProviderHelper {
         return packageNames;
     }
 
-    public static void addCryptoConsumer(Context context, String packageName) {
+    public static void addCryptoConsumer(Context context, String packageName, long keyId,
+            boolean asciiArmor) {
         ContentValues values = new ContentValues();
         values.put(ApiApps.PACKAGE_NAME, packageName);
+        values.put(ApiApps.KEY_ID, keyId);
+        values.put(ApiApps.ASCII_ARMOR, asciiArmor);
         context.getContentResolver().insert(ApiApps.CONTENT_URI, values);
     }
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
index 71b78ee01..2e6ab4263 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
@@ -76,10 +76,9 @@ public class CryptoService extends Service {
     public IBinder onBind(Intent intent) {
         // return different binder for connections from internal service activity
         if (ACTION_SERVICE_ACTIVITY.equals(intent.getAction())) {
-            String callingPackageName = intent.getPackage();
 
             // this binder can only be used from OpenPGP Keychain
-            if (callingPackageName.equals(Constants.PACKAGE_NAME)) {
+            if (isCallerAllowed(true)) {
                 return mBinderServiceActivity;
             } else {
                 Log.e(Constants.TAG, "This binder can only be used from " + Constants.PACKAGE_NAME);
@@ -150,8 +149,8 @@ public class CryptoService extends Service {
 
                 // start passphrase dialog
                 Bundle extras = new Bundle();
-                extras.putLong(ServiceActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
-                pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_CACHE_PASSPHRASE, extras);
+                extras.putLong(CryptoServiceActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
+                pauseQueueAndStartServiceActivity(CryptoServiceActivity.ACTION_CACHE_PASSPHRASE, extras);
             }
 
             // if (signedOnly) {
@@ -255,7 +254,7 @@ public class CryptoService extends Service {
         public void setup(boolean asciiArmor, boolean newKeyring, String newKeyringUserId)
                 throws RemoteException {
             // TODO Auto-generated method stub
-            
+
         }
 
     };
@@ -267,7 +266,7 @@ public class CryptoService extends Service {
 
             if (success) {
                 // resume threads
-                if (isPackageAllowed(packageName)) {
+                if (isPackageAllowed(packageName, false)) {
                     mThreadPool.resume();
                 } else {
                     // TODO: should not happen?
@@ -287,7 +286,7 @@ public class CryptoService extends Service {
     };
 
     private void checkAndEnqueue(Runnable r) {
-        if (isCallerAllowed()) {
+        if (isCallerAllowed(false)) {
             mThreadPool.execute(r);
 
             Log.d(Constants.TAG, "Enqueued runnable…");
@@ -298,8 +297,8 @@ public class CryptoService extends Service {
             Log.e(Constants.TAG, "Not allowed to use service! Starting activity for registration!");
             Bundle extras = new Bundle();
             // TODO: currently simply uses first entry
-            extras.putString(ServiceActivity.EXTRA_PACKAGE_NAME, callingPackages[0]);
-            pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_REGISTER, extras);
+            extras.putString(CryptoServiceActivity.EXTRA_PACKAGE_NAME, callingPackages[0]);
+            pauseQueueAndStartServiceActivity(CryptoServiceActivity.ACTION_REGISTER, extras);
 
             mThreadPool.execute(r);
 
@@ -311,16 +310,18 @@ public class CryptoService extends Service {
      * Checks if process that binds to this service (i.e. the package name corresponding to the
      * process) is in the list of allowed package names.
      * 
+     * @param allowOnlySelf
+     *            allow only Keychain app itself
      * @return true if process is allowed to use this service
      */
-    private boolean isCallerAllowed() {
+    private boolean isCallerAllowed(boolean allowOnlySelf) {
         String[] callingPackages = getPackageManager().getPackagesForUid(Binder.getCallingUid());
 
         // is calling package allowed to use this service?
         for (int i = 0; i < callingPackages.length; i++) {
             String currentPkg = callingPackages[i];
 
-            if (isPackageAllowed(currentPkg)) {
+            if (isPackageAllowed(currentPkg, allowOnlySelf)) {
                 return true;
             }
         }
@@ -329,14 +330,22 @@ public class CryptoService extends Service {
         return false;
     }
 
-    private boolean isPackageAllowed(String packageName) {
+    /**
+     * Checks if packageName is a registered app for the API.
+     * 
+     * @param packageName
+     * @param allowOnlySelf
+     *            allow only Keychain app itself
+     * @return
+     */
+    private boolean isPackageAllowed(String packageName, boolean allowOnlySelf) {
         Log.d(Constants.TAG, "packageName: " + packageName);
 
-        ArrayList<String> allowedPkgs = ProviderHelper.getCryptoConsumers(mContext);
+        ArrayList<String> allowedPkgs = ProviderHelper.getRegisteredApiApps(mContext);
         Log.d(Constants.TAG, "allowed: " + allowedPkgs);
 
         // check if package is allowed to use our service
-        if (allowedPkgs.contains(packageName)) {
+        if (allowedPkgs.contains(packageName) && (!allowOnlySelf)) {
             Log.d(Constants.TAG, "Package is allowed! packageName: " + packageName);
 
             return true;
@@ -353,7 +362,7 @@ public class CryptoService extends Service {
         mThreadPool.pause();
 
         Log.d(Constants.TAG, "starting activity...");
-        Intent intent = new Intent(getBaseContext(), ServiceActivity.class);
+        Intent intent = new Intent(getBaseContext(), CryptoServiceActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setAction(action);
         if (extras != null) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
similarity index 95%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
index 422026a19..39ff79f16 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
@@ -43,7 +43,7 @@ import android.widget.Toast;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
-public class ServiceActivity extends SherlockFragmentActivity {
+public class CryptoServiceActivity extends SherlockFragmentActivity {
 
     public static final String ACTION_REGISTER = "org.sufficientlysecure.keychain.remote_api.REGISTER";
     public static final String ACTION_CACHE_PASSPHRASE = "org.sufficientlysecure.keychain.remote_api.CRYPTO_CACHE_PASSPHRASE";
@@ -82,7 +82,8 @@ public class ServiceActivity extends SherlockFragmentActivity {
                 Log.d(Constants.TAG, "not bound yet");
 
                 Intent serviceIntent = new Intent();
-                serviceIntent.setAction("org.openintents.crypto.ICryptoService");
+                serviceIntent
+                        .setAction("org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback");
                 bindService(serviceIntent, mServiceActivityConnection, Context.BIND_AUTO_CREATE);
 
                 return true;
@@ -151,11 +152,13 @@ public class ServiceActivity extends SherlockFragmentActivity {
                             // Allow
 
                             if (settingsFragment.getSecretKeyId() == Id.key.none) {
-                                Toast.makeText(ServiceActivity.this,
+                                Toast.makeText(CryptoServiceActivity.this,
                                         R.string.api_register_error_select_key, Toast.LENGTH_LONG)
                                         .show();
                             } else {
-                                ProviderHelper.addCryptoConsumer(ServiceActivity.this, packageName);
+                                ProviderHelper.addCryptoConsumer(CryptoServiceActivity.this,
+                                        packageName, settingsFragment.getSecretKeyId(),
+                                        settingsFragment.isAsciiArmor());
                                 // Intent data = new Intent();
 
                                 try {

From fabb0389fc6c4b8a92d2681c8dc647b66e687b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 12:34:06 +0200
Subject: [PATCH 25/26] Put model into own class for easier use in service

---
 .../keychain/provider/ProviderHelper.java     | 49 +++++++++++--
 .../keychain/remote_api/AppSettings.java      | 70 +++++++++++++++++++
 .../remote_api/AppSettingsActivity.java       | 38 ++--------
 .../remote_api/AppSettingsFragment.java       | 44 ++++++------
 .../remote_api/CryptoServiceActivity.java     | 13 ++--
 5 files changed, 149 insertions(+), 65 deletions(-)
 create mode 100644 OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 60aa0542e..42210db6a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -36,6 +36,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
+import org.sufficientlysecure.keychain.remote_api.AppSettings;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
 
@@ -739,12 +740,50 @@ public class ProviderHelper {
         return packageNames;
     }
 
-    public static void addCryptoConsumer(Context context, String packageName, long keyId,
-            boolean asciiArmor) {
+    private static void contentValueForApiApps() {
+
+    }
+
+    public static void insertApiApp(Context context, AppSettings appSettings) {
         ContentValues values = new ContentValues();
-        values.put(ApiApps.PACKAGE_NAME, packageName);
-        values.put(ApiApps.KEY_ID, keyId);
-        values.put(ApiApps.ASCII_ARMOR, asciiArmor);
+        values.put(ApiApps.PACKAGE_NAME, appSettings.getPackageName());
+        values.put(ApiApps.KEY_ID, appSettings.getKeyId());
+        values.put(ApiApps.ASCII_ARMOR, appSettings.isAsciiArmor());
+        // TODO: other parameters
         context.getContentResolver().insert(ApiApps.CONTENT_URI, values);
     }
+
+    public static void updateApiApp(Context context, AppSettings appSettings, Uri uri) {
+        final ContentValues cv = new ContentValues();
+        cv.put(KeychainContract.ApiApps.KEY_ID, appSettings.getKeyId());
+
+        cv.put(KeychainContract.ApiApps.ASCII_ARMOR, appSettings.isAsciiArmor());
+        // TODO: other parameters
+
+        if (context.getContentResolver().update(uri, cv, null, null) <= 0) {
+            throw new RuntimeException();
+        }
+    }
+
+    public static AppSettings getApiAppSettings(Context context, Uri uri) {
+        AppSettings settings = new AppSettings();
+        Cursor cur = context.getContentResolver().query(uri, null, null, null, null);
+        if (cur.moveToFirst()) {
+            settings.setPackageName(cur.getString(cur
+                    .getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME)));
+
+            settings.setKeyId(cur.getLong(cur.getColumnIndex(KeychainContract.ApiApps.KEY_ID)));
+
+            settings.setAsciiArmor(cur.getInt(cur
+                    .getColumnIndexOrThrow(KeychainContract.ApiApps.ASCII_ARMOR)) == 1);
+
+            settings.setPackageName(cur.getString(cur
+                    .getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME)));
+
+            settings.setPackageName(cur.getString(cur
+                    .getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME)));
+        }
+
+        return settings;
+    }
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java
new file mode 100644
index 000000000..fe251a5e7
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java
@@ -0,0 +1,70 @@
+package org.sufficientlysecure.keychain.remote_api;
+
+import org.sufficientlysecure.keychain.Id;
+
+public class AppSettings {
+    private String packageName;
+    private long keyId = Id.key.none;
+    private boolean asciiArmor;
+    private int encryptionAlgorithm = 7; // AES-128
+    private int hashAlgorithm = 10; // SHA-512
+    private int compression = 2; // zlib
+
+    public AppSettings() {
+
+    }
+
+    public AppSettings(String packageName) {
+        super();
+        this.packageName = packageName;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public long getKeyId() {
+        return keyId;
+    }
+
+    public void setKeyId(long scretKeyId) {
+        this.keyId = scretKeyId;
+    }
+
+    public boolean isAsciiArmor() {
+        return asciiArmor;
+    }
+
+    public void setAsciiArmor(boolean asciiArmor) {
+        this.asciiArmor = asciiArmor;
+    }
+
+    public int getEncryptionAlgorithm() {
+        return encryptionAlgorithm;
+    }
+
+    public void setEncryptionAlgorithm(int encryptionAlgorithm) {
+        this.encryptionAlgorithm = encryptionAlgorithm;
+    }
+
+    public int getHashAlgorithm() {
+        return hashAlgorithm;
+    }
+
+    public void setHashAlgorithm(int hashAlgorithm) {
+        this.hashAlgorithm = hashAlgorithm;
+    }
+
+    public int getCompression() {
+        return compression;
+    }
+
+    public void setCompression(int compression) {
+        this.compression = compression;
+    }
+
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 55fa72b0e..155369601 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -2,12 +2,10 @@ package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.util.Log;
 
-import android.content.ContentValues;
 import android.content.Intent;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -20,9 +18,7 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
 public class AppSettingsActivity extends SherlockFragmentActivity {
-    // model
     private Uri mAppUri;
-    private String mPackageName;
 
     private AppSettingsFragment settingsFragment;
 
@@ -91,26 +87,8 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     }
 
     private void loadData(Uri appUri) {
-        Cursor cur = getContentResolver().query(appUri, null, null, null, null);
-        if (cur.moveToFirst()) {
-            mPackageName = cur.getString(cur.getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME));
-
-            settingsFragment.setPackage(mPackageName);
-
-            try {
-                long secretKeyId = (cur.getLong(cur
-                        .getColumnIndexOrThrow(KeychainContract.ApiApps.KEY_ID)));
-                Log.d(Constants.TAG, "mSecretKeyId: " + secretKeyId);
-                settingsFragment.setSecretKey(secretKeyId);
-
-                boolean asciiArmor = (cur.getInt(cur
-                        .getColumnIndexOrThrow(KeychainContract.ApiApps.ASCII_ARMOR)) == 1);
-                settingsFragment.setAsciiArmor(asciiArmor);
-
-            } catch (IllegalArgumentException e) {
-                Log.e(Constants.TAG, "AppSettingsActivity", e);
-            }
-        }
+        AppSettings settings = ProviderHelper.getApiAppSettings(this, appUri);
+        settingsFragment.setAppSettings(settings);
     }
 
     private void revokeAccess() {
@@ -121,15 +99,7 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     }
 
     private void save() {
-        final ContentValues cv = new ContentValues();
-        cv.put(KeychainContract.ApiApps.KEY_ID, settingsFragment.getSecretKeyId());
-
-        cv.put(KeychainContract.ApiApps.ASCII_ARMOR, settingsFragment.isAsciiArmor());
-        // TODO: other parameters
-
-        if (getContentResolver().update(mAppUri, cv, null, null) <= 0) {
-            throw new RuntimeException();
-        }
+        ProviderHelper.updateApiApp(this, settingsFragment.getAppSettings(), mAppUri);
 
         finish();
     }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
index 69d4e68ea..1bb447a7d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
@@ -26,6 +26,8 @@ import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -33,7 +35,7 @@ import android.widget.TextView;
 public class AppSettingsFragment extends Fragment {
 
     // model
-    private long mSecretKeyId = Id.key.none;
+    private AppSettings appSettings;
 
     // view
     private LinearLayout mAdvancedSettingsContainer;
@@ -45,21 +47,15 @@ public class AppSettingsFragment extends Fragment {
     private Button mSelectKeyButton;
     private CheckBox mAsciiArmorCheckBox;
 
-    public void setSecretKey(long keyId) {
-        mSecretKeyId = keyId;
-        updateSelectedKeyView(keyId);
+    public AppSettings getAppSettings() {
+        return appSettings;
     }
 
-    public long getSecretKeyId() {
-        return mSecretKeyId;
-    }
-
-    public void setAsciiArmor(boolean value) {
-        mAsciiArmorCheckBox.setChecked(value);
-    }
-
-    public boolean isAsciiArmor() {
-        return mAsciiArmorCheckBox.isChecked();
+    public void setAppSettings(AppSettings appSettings) {
+        this.appSettings = appSettings;
+        setPackage(appSettings.getPackageName());
+        updateSelectedKeyView(appSettings.getKeyId());
+        mAsciiArmorCheckBox.setChecked(appSettings.isAsciiArmor());
     }
 
     /**
@@ -92,6 +88,14 @@ public class AppSettingsFragment extends Fragment {
             }
         });
 
+        mAsciiArmorCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                appSettings.setAsciiArmor(isChecked);
+            }
+        });
+
         final Animation visibleAnimation = new AlphaAnimation(0.0f, 1.0f);
         visibleAnimation.setDuration(250);
         final Animation invisibleAnimation = new AlphaAnimation(1.0f, 0.0f);
@@ -123,7 +127,6 @@ public class AppSettingsFragment extends Fragment {
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-
     }
 
     private void selectSecretKey() {
@@ -131,7 +134,7 @@ public class AppSettingsFragment extends Fragment {
         startActivityForResult(intent, Id.request.secret_keys);
     }
 
-    public void setPackage(String packageName) {
+    private void setPackage(String packageName) {
         PackageManager pm = getActivity().getApplicationContext().getPackageManager();
 
         // get application name and icon from package manager
@@ -181,15 +184,16 @@ public class AppSettingsFragment extends Fragment {
         switch (requestCode) {
 
         case Id.request.secret_keys: {
+            long secretKeyId;
             if (resultCode == Activity.RESULT_OK) {
                 Bundle bundle = data.getExtras();
-                mSecretKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
-                Log.d(Constants.TAG, "jo " + mSecretKeyId);
+                secretKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
 
             } else {
-                mSecretKeyId = Id.key.none;
+                secretKeyId = Id.key.none;
             }
-            updateSelectedKeyView(mSecretKeyId);
+            appSettings.setKeyId(secretKeyId);
+            updateSelectedKeyView(secretKeyId);
             break;
         }
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
index 39ff79f16..06c64559a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
@@ -151,15 +151,14 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
                         public void onClick(View v) {
                             // Allow
 
-                            if (settingsFragment.getSecretKeyId() == Id.key.none) {
+                            // user needs to select a key!
+                            if (settingsFragment.getAppSettings().getKeyId() == Id.key.none) {
                                 Toast.makeText(CryptoServiceActivity.this,
                                         R.string.api_register_error_select_key, Toast.LENGTH_LONG)
                                         .show();
                             } else {
-                                ProviderHelper.addCryptoConsumer(CryptoServiceActivity.this,
-                                        packageName, settingsFragment.getSecretKeyId(),
-                                        settingsFragment.isAsciiArmor());
-                                // Intent data = new Intent();
+                                ProviderHelper.insertApiApp(CryptoServiceActivity.this,
+                                        settingsFragment.getAppSettings());
 
                                 try {
                                     mServiceCallback.onRegistered(true, packageName);
@@ -199,7 +198,9 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
             settingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
                     R.id.api_app_settings_fragment);
 
-            settingsFragment.setPackage(packageName);
+            AppSettings settings = new AppSettings(packageName);
+            settingsFragment.setAppSettings(settings);
+            
 
             // TODO: handle if app is already registered
             // LinearLayout layoutRegister = (LinearLayout)

From 3a66c1c25aff1dadf4779c2df0fac04f3a9f3c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 13:48:27 +0200
Subject: [PATCH 26/26] Testing encrypt by service

---
 .../demo/CryptoProviderDemoActivity.java      | 23 ++++-
 .../keychain/provider/ProviderHelper.java     |  3 +
 .../keychain/remote_api/CryptoService.java    | 85 +++++++++++++------
 .../service/PassphraseCacheService.java       |  2 +-
 4 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
index 7dcd7c66f..319820d7c 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -73,11 +73,18 @@ public class CryptoProviderDemoActivity extends Activity {
     final ICryptoCallback.Stub encryptCallback = new ICryptoCallback.Stub() {
 
         @Override
-        public void onSuccess(byte[] outputBytes, CryptoSignatureResult signatureResult)
+        public void onSuccess(final byte[] outputBytes, CryptoSignatureResult signatureResult)
                 throws RemoteException {
             Log.d(Constants.TAG, "onEncryptSignSuccess");
 
-            // TODO
+            runOnUiThread(new Runnable() {
+
+                @Override
+                public void run() {
+                    mCiphertext.setText(new String(outputBytes));
+
+                }
+            });
         }
 
         @Override
@@ -91,11 +98,19 @@ public class CryptoProviderDemoActivity extends Activity {
     final ICryptoCallback.Stub decryptCallback = new ICryptoCallback.Stub() {
 
         @Override
-        public void onSuccess(byte[] outputBytes, CryptoSignatureResult signatureResult)
+        public void onSuccess(final byte[] outputBytes, final CryptoSignatureResult signatureResult)
                 throws RemoteException {
             Log.d(Constants.TAG, "onDecryptVerifySuccess");
 
-            mMessage.setText(new String(outputBytes));
+            runOnUiThread(new Runnable() {
+
+                @Override
+                public void run() {
+                    mMessage.setText(new String(outputBytes) + "\n\n" + signatureResult.toString());
+
+                }
+            });
+
         }
 
         @Override
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 42210db6a..d0fcfe999 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -768,6 +768,9 @@ public class ProviderHelper {
     public static AppSettings getApiAppSettings(Context context, Uri uri) {
         AppSettings settings = new AppSettings();
         Cursor cur = context.getContentResolver().query(uri, null, null, null, null);
+        if (cur == null) {
+            return null;
+        }
         if (cur.moveToFirst()) {
             settings.setPackageName(cur.getString(cur
                     .getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME)));
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
index 2e6ab4263..125967c66 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.prefs.Preferences;
 
 import org.openintents.crypto.CryptoError;
 import org.openintents.crypto.CryptoSignatureResult;
@@ -32,18 +33,19 @@ import org.sufficientlysecure.keychain.helper.PgpMain;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.util.PausableThreadPoolExecutor;
-
 import org.openintents.crypto.ICryptoCallback;
 import org.openintents.crypto.ICryptoService;
 
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -89,29 +91,50 @@ public class CryptoService extends Service {
         }
     }
 
+    private String getCachedPassphrase(long keyId) {
+        String passphrase = PassphraseCacheService.getCachedPassphrase(mContext, keyId);
+
+        if (passphrase == null) {
+            Log.d(Constants.TAG, "No passphrase! Activity required!");
+
+            // start passphrase dialog
+            Bundle extras = new Bundle();
+            extras.putLong(CryptoServiceActivity.EXTRA_SECRET_KEY_ID, keyId);
+            pauseQueueAndStartServiceActivity(CryptoServiceActivity.ACTION_CACHE_PASSPHRASE, extras);
+        }
+
+        return passphrase;
+    }
+
     private synchronized void encryptSafe(byte[] inputBytes, String[] encryptionUserIds,
-            ICryptoCallback callback) throws RemoteException {
+            AppSettings appSettings, ICryptoCallback callback) throws RemoteException {
         try {
             // build InputData and write into OutputStream
             InputStream inputStream = new ByteArrayInputStream(inputBytes);
             long inputLength = inputBytes.length;
             InputData inputData = new InputData(inputStream, inputLength);
 
-            OutputStream outStream = new ByteArrayOutputStream();
+            OutputStream outputStream = new ByteArrayOutputStream();
 
-            // TODO: hardcoded...
-            boolean useAsciiArmor = true;
-            int compressionId = 2; // zlib
+            String passphrase = getCachedPassphrase(appSettings.getKeyId());
 
-            // PgpMain.encryptAndSign(this, this, inputData, outStream, useAsciiArmor,
-            // compressionId, encryptionKeyIds, encryptionPassphrase, Preferences
-            // .getPreferences(this).getDefaultEncryptionAlgorithm(),
-            // secretKeyId,
-            // Preferences.getPreferences(this).getDefaultHashAlgorithm(), Preferences
-            // .getPreferences(this).getForceV3Signatures(),
-            // PassphraseCacheService.getCachedPassphrase(this, secretKeyId));
+            PgpMain.encryptAndSign(mContext, null, inputData, outputStream,
+                    appSettings.isAsciiArmor(), appSettings.getCompression(), new long[] {},
+                    "test", appSettings.getEncryptionAlgorithm(), Id.key.none,
+                    appSettings.getHashAlgorithm(), true, passphrase);
 
-            outStream.close();
+            // PgpMain.encryptAndSign(this, this, inputData, outputStream,
+            // appSettings.isAsciiArmor(),
+            // appSettings.getCompression(), encryptionKeyIds, encryptionPassphrase,
+            // appSettings.getEncryptionAlgorithm(), appSettings.getKeyId(),
+            // appSettings.getHashAlgorithm(), true, passphrase);
+
+            outputStream.close();
+
+            byte[] outputBytes = ((ByteArrayOutputStream) outputStream).toByteArray();
+
+            // return over handler on client side
+            callback.onSuccess(outputBytes, null);
         } catch (Exception e) {
             Log.e(Constants.TAG, "KeychainService, Exception!", e);
 
@@ -133,6 +156,8 @@ public class CryptoService extends Service {
 
             OutputStream outputStream = new ByteArrayOutputStream();
 
+            // TODO: This allows to decrypt messages with ALL secret keys, not only the one for the
+            // app, Fix this?
             long secretKeyId = PgpMain.getDecryptionKeyId(mContext, inputStream);
             if (secretKeyId == Id.key.none) {
                 throw new PgpMain.PgpGeneralException(getString(R.string.error_noSecretKeyFound));
@@ -142,16 +167,7 @@ public class CryptoService extends Service {
 
             Log.d(Constants.TAG, "secretKeyId " + secretKeyId);
 
-            String passphrase = PassphraseCacheService.getCachedPassphrase(mContext, secretKeyId);
-
-            if (passphrase == null) {
-                Log.d(Constants.TAG, "No passphrase! Activity required!");
-
-                // start passphrase dialog
-                Bundle extras = new Bundle();
-                extras.putLong(CryptoServiceActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
-                pauseQueueAndStartServiceActivity(CryptoServiceActivity.ACTION_CACHE_PASSPHRASE, extras);
-            }
+            String passphrase = getCachedPassphrase(secretKeyId);
 
             // if (signedOnly) {
             // resultData = PgpMain.verifyText(this, this, inputData, outStream,
@@ -202,12 +218,14 @@ public class CryptoService extends Service {
         public void encrypt(final byte[] inputBytes, final String[] encryptionUserIds,
                 final ICryptoCallback callback) throws RemoteException {
 
+            final AppSettings settings = getAppSettings();
+
             Runnable r = new Runnable() {
 
                 @Override
                 public void run() {
                     try {
-                        encryptSafe(inputBytes, encryptionUserIds, callback);
+                        encryptSafe(inputBytes, encryptionUserIds, settings, callback);
                     } catch (RemoteException e) {
                         Log.e(Constants.TAG, "CryptoService", e);
                     }
@@ -330,6 +348,23 @@ public class CryptoService extends Service {
         return false;
     }
 
+    private AppSettings getAppSettings() {
+        String[] callingPackages = getPackageManager().getPackagesForUid(Binder.getCallingUid());
+
+        // is calling package allowed to use this service?
+        for (int i = 0; i < callingPackages.length; i++) {
+            String currentPkg = callingPackages[i];
+
+            Uri uri = KeychainContract.ApiApps.buildByPackageNameUri(currentPkg);
+
+            AppSettings settings = ProviderHelper.getApiAppSettings(this, uri);
+
+            return settings;
+        }
+
+        return null;
+    }
+
     /**
      * Checks if packageName is a registered app for the API.
      * 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 6a4c8a0af..343e5fbc3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -178,7 +178,7 @@ public class PassphraseCacheService extends Service {
             }
             masterKeyId = masterKey.getKeyID();
         }
-        Log.d(TAG, "getCachedPassphraseImpl() for masterKeyId" + masterKeyId);
+        Log.d(TAG, "getCachedPassphraseImpl() for masterKeyId " + masterKeyId);
 
         // get cached passphrase
         String cachedPassphrase = mPassphraseCache.get(masterKeyId);