aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-02 19:23:08 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-02 19:26:07 +0200
commit37cb5c4c78880b5b4737cffdaa4ead76506a3843 (patch)
tree244b981b9475cbbdb021a85a5f7eab35b120c994 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
parent9a296c012d8aaaf4273892ad06a4f66ea4edefac (diff)
downloadopen-keychain-37cb5c4c78880b5b4737cffdaa4ead76506a3843.tar.gz
open-keychain-37cb5c4c78880b5b4737cffdaa4ead76506a3843.tar.bz2
open-keychain-37cb5c4c78880b5b4737cffdaa4ead76506a3843.zip
make getSignId a secret key operation, and respect unavailable keys
This one should remedy #811, but waiting for a test
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java4
1 files changed, 2 insertions, 2 deletions
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)) {