wrapped-key-ring: no UncachedSecretKeyRing after all

3 files changed, 11 insertions, 12 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index ed8171587..ceaa93f9b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -268,7 +268,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
                     byte[] data = cursor.getBlob(0);
                     try {
                         UncachedKeyRing ring = UncachedKeyRing.decodeFromData(data);
-                        providerHelper.saveKeyRing(ring);
+                        providerHelper.savePublicKeyRing(ring);
                     } catch(PgpGeneralException e) {
                         Log.e(Constants.TAG, "Error decoding keyring blob!");
                     }
@@ -292,7 +292,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
                     byte[] data = cursor.getBlob(0);
                     try {
                         UncachedKeyRing ring = UncachedKeyRing.decodeFromData(data);
-                        providerHelper.saveKeyRing(ring);
+                        providerHelper.savePublicKeyRing(ring);
                     } catch(PgpGeneralException e) {
                         Log.e(Constants.TAG, "Error decoding keyring blob!");
                     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 2f6cded91..b651069e9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -621,7 +621,7 @@ public class KeychainProvider extends ContentProvider {
 
                 case KEY_RING_CERTS:
                     // we replace here, keeping only the latest signature
-                    // TODO this would be better handled in saveKeyRing directly!
+                    // TODO this would be better handled in savePublicKeyRing directly!
                     db.replaceOrThrow(Tables.CERTS, null, values);
                     keyId = values.getAsLong(Certs.MASTER_KEY_ID);
                     break;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index b6f75e00d..55e8c77d1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -35,7 +35,6 @@ import org.sufficientlysecure.keychain.pgp.WrappedPublicKeyRing;
 import org.sufficientlysecure.keychain.pgp.PgpHelper;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedSecretKeyRing;
 import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
@@ -151,7 +150,7 @@ public class ProviderHelper {
                 if (data != null) {
                     try {
                         result.put(masterKeyId,
-                                UncachedKeyRing.decodePubkeyFromData(data).getPublicKey());
+                                UncachedKeyRing.decodePublicFromData(data).getPublicKey());
                     } catch(PgpGeneralException e) {
                         Log.e(Constants.TAG, "Error parsing keyring, skipping.");
                     } catch(IOException e) {
@@ -221,12 +220,12 @@ public class ProviderHelper {
      * Saves PGPPublicKeyRing with its keys and userIds in DB
      */
     @SuppressWarnings("unchecked")
-    public void saveKeyRing(UncachedKeyRing keyRing) throws IOException {
+    public void savePublicKeyRing(UncachedKeyRing keyRing) throws IOException {
         UncachedPublicKey masterKey = keyRing.getPublicKey();
         long masterKeyId = masterKey.getKeyId();
 
         // IF there is a secret key, preserve it!
-        UncachedSecretKeyRing secretRing = null;
+        UncachedKeyRing secretRing = null;
         try {
             secretRing = getWrappedSecretKeyRing(masterKeyId).getUncached();
         } catch (NotFoundException e) {
@@ -343,7 +342,7 @@ public class ProviderHelper {
 
         // Save the saved keyring (if any)
         if (secretRing != null) {
-            saveKeyRing(secretRing);
+            saveSecretKeyRing(secretRing);
         }
 
     }
@@ -373,7 +372,7 @@ public class ProviderHelper {
      * Saves a PGPSecretKeyRing in the DB. This will only work if a corresponding public keyring
      * is already in the database!
      */
-    public void saveKeyRing(UncachedSecretKeyRing keyRing) throws IOException {
+    public void saveSecretKeyRing(UncachedKeyRing keyRing) throws IOException {
         long masterKeyId = keyRing.getMasterKeyId();
 
         {
@@ -413,12 +412,12 @@ public class ProviderHelper {
     public void saveKeyRing(UncachedKeyRing pubRing, UncachedKeyRing secRing) throws IOException {
         long masterKeyId = pubRing.getPublicKey().getKeyId();
 
-        // delete secret keyring (so it isn't unnecessarily saved by public-saveKeyRing below)
+        // delete secret keyring (so it isn't unnecessarily saved by public-savePublicKeyRing below)
         mContentResolver.delete(KeyRingData.buildSecretKeyRingUri(Long.toString(masterKeyId)), null, null);
 
         // save public keyring
-        saveKeyRing(pubRing);
-        saveKeyRing(secRing);
+        savePublicKeyRing(pubRing);
+        savePublicKeyRing(secRing);
     }
 
     /**