save keyring in-place, fixes #228, #203

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java

@@ -62,7 +62,7 @@ public class ProviderHelper {
      */
     public static PGPKeyRing getPGPKeyRing(Context context, Uri queryUri) {
         Cursor cursor = context.getContentResolver().query(queryUri,
-                new String[] { KeyRings._ID, KeyRings.KEY_RING_DATA }, null, null, null);
+                new String[]{KeyRings._ID, KeyRings.KEY_RING_DATA}, null, null, null);
 
         PGPKeyRing keyRing = null;
         if (cursor != null && cursor.moveToFirst()) {
@@ -205,9 +205,18 @@ public class ProviderHelper {
         PGPPublicKey masterKey = keyRing.getPublicKey();
         long masterKeyId = masterKey.getKeyID();
 
-        // delete old version of this keyRing, which also deletes all keys and userIds on cascade
         Uri deleteUri = KeyRings.buildPublicKeyRingsByMasterKeyIdUri(Long.toString(masterKeyId));
 
+        // get current _ID of key
+        long currentRowId = -1;
+        Cursor oldQuery = context.getContentResolver().query(deleteUri, new String[]{KeyRings._ID}, null, null, null);
+        if (oldQuery != null && oldQuery.moveToFirst()) {
+            currentRowId = oldQuery.getLong(0);
+        } else {
+            Log.e(Constants.TAG, "Key could not be found! Something wrong is happening!");
+        }
+
+        // delete old version of this keyRing, which also deletes all keys and userIds on cascade
         try {
             context.getContentResolver().delete(deleteUri, null, null);
         } catch (UnsupportedOperationException e) {
@@ -215,6 +224,11 @@ public class ProviderHelper {
         }
 
         ContentValues values = new ContentValues();
+        // use exactly the same _ID again to replace key in-place.
+        // NOTE: If we would not use the same _ID again, getting back to the ViewKeyActivity would result in Nullpointer,
+        // because the currently loaded key would be gone from the database
+        if (currentRowId != -1)
+            values.put(KeyRings._ID, currentRowId);
         values.put(KeyRings.MASTER_KEY_ID, masterKeyId);
         values.put(KeyRings.KEY_RING_DATA, keyRing.getEncoded());
 
@@ -261,9 +275,18 @@ public class ProviderHelper {
         PGPSecretKey masterKey = keyRing.getSecretKey();
         long masterKeyId = masterKey.getKeyID();
 
-        // delete old version of this keyRing, which also deletes all keys and userIds on cascade
         Uri deleteUri = KeyRings.buildSecretKeyRingsByMasterKeyIdUri(Long.toString(masterKeyId));
 
+        // get current _ID of key
+        long currentRowId = -1;
+        Cursor oldQuery = context.getContentResolver().query(deleteUri, new String[]{KeyRings._ID}, null, null, null);
+        if (oldQuery != null && oldQuery.moveToFirst()) {
+            currentRowId = oldQuery.getLong(0);
+        } else {
+            Log.e(Constants.TAG, "Key could not be found! Something wrong is happening!");
+        }
+
+        // delete old version of this keyRing, which also deletes all keys and userIds on cascade
         try {
             context.getContentResolver().delete(deleteUri, null, null);
         } catch (UnsupportedOperationException e) {
@@ -271,6 +294,11 @@ public class ProviderHelper {
         }
 
         ContentValues values = new ContentValues();
+        // use exactly the same _ID again to replace key in-place.
+        // NOTE: If we would not use the same _ID again, getting back to the ViewKeyActivity would result in Nullpointer,
+        // because the currently loaded key would be gone from the database
+        if (currentRowId != -1)
+            values.put(KeyRings._ID, currentRowId);
         values.put(KeyRings.MASTER_KEY_ID, masterKeyId);
         values.put(KeyRings.KEY_RING_DATA, keyRing.getEncoded());
 
@@ -433,7 +461,7 @@ public class ProviderHelper {
      */
     private static ArrayList<Long> getKeyRingsMasterKeyIds(Context context, Uri queryUri) {
         Cursor cursor = context.getContentResolver().query(queryUri,
-                new String[] { KeyRings.MASTER_KEY_ID }, null, null, null);
+                new String[]{KeyRings.MASTER_KEY_ID}, null, null, null);
 
         ArrayList<Long> masterKeyIds = new ArrayList<Long>();
         if (cursor != null) {
@@ -517,13 +545,13 @@ public class ProviderHelper {
      * @return
      */
     private static boolean getMasterKeyCanSign(Context context, Uri queryUri, long keyRingRowId) {
-        String[] projection = new String[] {
+        String[] projection = new String[]{
                 KeyRings.MASTER_KEY_ID,
                 "(SELECT COUNT(sign_keys." + Keys._ID + ") FROM " + Tables.KEYS
                         + " AS sign_keys WHERE sign_keys." + Keys.KEY_RING_ROW_ID + " = "
                         + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
                         + " AND sign_keys." + Keys.CAN_SIGN + " = '1' AND " + Keys.IS_MASTER_KEY
-                        + " = 1) AS sign", };
+                        + " = 1) AS sign",};
 
         ContentResolver cr = context.getContentResolver();
         Cursor cursor = cr.query(queryUri, projection, null, null, null);
@@ -563,7 +591,7 @@ public class ProviderHelper {
      * @return
      */
     public static long getMasterKeyId(Context context, Uri queryUri) {
-        String[] projection = new String[] { KeyRings.MASTER_KEY_ID };
+        String[] projection = new String[]{KeyRings.MASTER_KEY_ID};
 
         ContentResolver cr = context.getContentResolver();
         Cursor cursor = cr.query(queryUri, projection, null, null, null);
@@ -711,7 +739,7 @@ public class ProviderHelper {
             inMasterKeyList += ")";
 
             cursor = context.getContentResolver().query(baseUri,
-                    new String[] { KeyRings._ID, KeyRings.MASTER_KEY_ID, KeyRings.KEY_RING_DATA },
+                    new String[]{KeyRings._ID, KeyRings.MASTER_KEY_ID, KeyRings.KEY_RING_DATA},
                     inMasterKeyList, null, null);
         }
 
@@ -788,7 +816,7 @@ public class ProviderHelper {
     public static byte[] getApiAppSignature(Context context, String packageName) {
         Uri queryUri = KeychainContract.ApiApps.buildByPackageNameUri(packageName);
 
-        String[] projection = new String[] { ApiApps.PACKAGE_SIGNATURE };
+        String[] projection = new String[]{ApiApps.PACKAGE_SIGNATURE};
 
         ContentResolver cr = context.getContentResolver();
         Cursor cursor = cr.query(queryUri, projection, null, null, null);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java

@@ -236,6 +236,7 @@ public class SignKeyActivity extends SherlockFragmentActivity implements
                          */
                         uploadKey();
                     } else {
+                        setResult(RESULT_OK);
                         finish();
                     }
                 }
@@ -278,10 +279,10 @@ public class SignKeyActivity extends SherlockFragmentActivity implements
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
-
                     Toast.makeText(SignKeyActivity.this, R.string.key_send_success,
                             Toast.LENGTH_SHORT).show();
 
+                    setResult(RESULT_OK);
                     finish();
                 }
             };

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

@@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Objects;
 
 import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
@@ -111,16 +112,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
         mUserIds = (ListView) findViewById(R.id.user_ids);
         mKeys = (ListView) findViewById(R.id.keys);
 
-        Intent intent = getIntent();
+        loadData(getIntent());
-        mDataUri = intent.getData();
-        if (mDataUri == null) {
-            Log.e(Constants.TAG, "Intent data missing. Should be Uri of key!");
-            finish();
-            return;
-        } else {
-            Log.d(Constants.TAG, "uri: " + mDataUri);
-            loadData(mDataUri);
-        }
     }
 
     @Override
@@ -188,7 +180,21 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
         return super.onOptionsItemSelected(item);
     }
 
-    private void loadData(Uri dataUri) {
+    private void loadData(Intent intent) {
+        if (intent.getData().equals(mDataUri)) {
+            Log.d(Constants.TAG, "Same URI, no need to load the data again!");
+            return;
+        }
+
+        mDataUri = intent.getData();
+        if (mDataUri == null) {
+            Log.e(Constants.TAG, "Intent data missing. Should be Uri of key!");
+            finish();
+            return;
+        }
+
+        Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
+
         mActionEncrypt.setOnClickListener(new OnClickListener() {
 
             @Override
@@ -198,7 +204,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
                         ViewKeyActivity.this, mDataUri);
                 PGPPublicKey publicKey = ring.getPublicKey();
 
-                long[] encryptionKeyIds = new long[] { publicKey.getKeyID() };
+                long[] encryptionKeyIds = new long[]{publicKey.getKeyID()};
                 Intent intent = new Intent(ViewKeyActivity.this, EncryptActivity.class);
                 intent.setAction(EncryptActivity.ACTION_ENCRYPT);
                 intent.putExtra(EncryptActivity.EXTRA_ENCRYPTION_KEY_IDS, encryptionKeyIds);
@@ -229,21 +235,21 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
         getSupportLoaderManager().initLoader(LOADER_ID_KEYS, null, this);
     }
 
-    static final String[] KEYRING_PROJECTION = new String[] { KeyRings._ID, KeyRings.MASTER_KEY_ID,
+    static final String[] KEYRING_PROJECTION = new String[]{KeyRings._ID, KeyRings.MASTER_KEY_ID,
-            UserIds.USER_ID };
+            UserIds.USER_ID};
     static final int KEYRING_INDEX_ID = 0;
     static final int KEYRING_INDEX_MASTER_KEY_ID = 1;
     static final int KEYRING_INDEX_USER_ID = 2;
 
-    static final String[] USER_IDS_PROJECTION = new String[] { UserIds._ID, UserIds.USER_ID,
+    static final String[] USER_IDS_PROJECTION = new String[]{UserIds._ID, UserIds.USER_ID,
-            UserIds.RANK, };
+            UserIds.RANK,};
     // not the main user id
     static final String USER_IDS_SELECTION = UserIds.RANK + " > 0 ";
     static final String USER_IDS_SORT_ORDER = UserIds.USER_ID + " COLLATE LOCALIZED ASC";
 
-    static final String[] KEYS_PROJECTION = new String[] { Keys._ID, Keys.KEY_ID,
+    static final String[] KEYS_PROJECTION = new String[]{Keys._ID, Keys.KEY_ID,
             Keys.IS_MASTER_KEY, Keys.ALGORITHM, Keys.KEY_SIZE, Keys.CAN_CERTIFY, Keys.CAN_SIGN,
-            Keys.CAN_ENCRYPT, Keys.CREATION, Keys.EXPIRY };
+            Keys.CAN_ENCRYPT, Keys.CREATION, Keys.EXPIRY};
     static final String KEYS_SORT_ORDER = Keys.RANK + " ASC";
     static final int KEYS_INDEX_ID = 0;
     static final int KEYS_INDEX_KEY_ID = 1;
@@ -340,7 +346,6 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
 
                     // TODO: Can this be done better? fingerprint in db?
                     String fingerprint = PgpKeyHelper.getFingerPrint(this, keyId);
-
                     fingerprint = fingerprint.replace("  ", "\n");
                     mFingerprint.setText(fingerprint);
 
@@ -438,7 +443,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
             // get public keyring as ascii armored string
             long masterKeyId = ProviderHelper.getMasterKeyId(this, dataUri);
             ArrayList<String> keyringArmored = ProviderHelper.getKeyRingsAsArmoredString(this,
-                    dataUri, new long[] { masterKeyId });
+                    dataUri, new long[]{masterKeyId});
 
             content = keyringArmored.get(0);
 
@@ -469,7 +474,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
         // get public keyring as ascii armored string
         long masterKeyId = ProviderHelper.getMasterKeyId(this, dataUri);
         ArrayList<String> keyringArmored = ProviderHelper.getKeyRingsAsArmoredString(this, dataUri,
-                new long[] { masterKeyId });
+                new long[]{masterKeyId});
 
         ClipboardReflection.copyToClipboard(this, keyringArmored.get(0));
         Toast.makeText(getApplicationContext(), R.string.key_copied_to_clipboard, Toast.LENGTH_LONG)