From 37cb5c4c78880b5b4737cffdaa4ead76506a3843 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 2 Oct 2014 19:23:08 +0200 Subject: make getSignId a secret key operation, and respect unavailable keys This one should remedy #811, but waiting for a test --- .../java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index b7ee453d5..ed1f19dbd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -293,7 +293,7 @@ public class OpenPgpService extends RemoteService { // Find the appropriate subkey to sign with CachedPublicKeyRing signingRing = new ProviderHelper(this).getCachedPublicKeyRing(accSettings.getKeyId()); - final long sigSubKeyId = signingRing.getSignId(); + final long sigSubKeyId = signingRing.getSecretSignId(); // sign-only PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder( @@ -405,7 +405,7 @@ public class OpenPgpService extends RemoteService { // Find the appropriate subkey to sign with CachedPublicKeyRing signingRing = new ProviderHelper(this).getCachedPublicKeyRing(accSettings.getKeyId()); - final long sigSubKeyId = signingRing.getSignId(); + final long sigSubKeyId = signingRing.getSecretSignId(); String passphrase; if (data.hasExtra(OpenPgpApi.EXTRA_PASSPHRASE)) { -- cgit v1.2.3