make getSignId a secret key operation, and respect unavailable keys

This one should remedy #811, but waiting for a test
2014-10-02 19:23:08 +02:00
parent 9a296c012d
commit 37cb5c4c78
8 changed files with 38 additions and 112 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -294,7 +294,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                        // Find the appropriate subkey to sign with
                        CachedPublicKeyRing signingRing =
                                new ProviderHelper(this).getCachedPublicKeyRing(sigMasterKeyId);
-                        long sigSubKeyId = signingRing.getSignId();
+                        long sigSubKeyId = signingRing.getSecretSignId();

                        // Set signature settings
                        builder.setSignatureMasterKeyId(sigMasterKeyId)