diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-09 16:26:38 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-09 16:26:38 +0200 |
commit | 73ccff9537f8be9341f284ca3241f14f529ab067 (patch) | |
tree | d3bf64424b54d394da45f9b01d2c1165d9850e3b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 340ed7c08dc59ac4a90069112aa599c36f94d4b9 (diff) | |
parent | 134e1cb764656051c73bf332eabc3cdc9cedc87d (diff) | |
download | open-keychain-73ccff9537f8be9341f284ca3241f14f529ab067.tar.gz open-keychain-73ccff9537f8be9341f284ca3241f14f529ab067.tar.bz2 open-keychain-73ccff9537f8be9341f284ca3241f14f529ab067.zip |
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index b9c42db3f..90091ce35 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -30,6 +30,7 @@ import android.os.RemoteException; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpCertifyOperation; +import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException; import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException; import org.sufficientlysecure.keychain.service.results.CertifyResult; import org.sufficientlysecure.keychain.util.FileHelper; @@ -719,7 +720,7 @@ public class KeychainIntentService extends IntentService implements Progressable builder.setNfcState(nfcHash, nfcTimestamp); } - } catch (PgpGeneralException e) { + } catch (PgpKeyNotFoundException e) { // encrypt-only // TODO Just silently drop the requested signature? Shouldn't we throw here? } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index 9638fb7bf..97fb7e7b4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -39,11 +39,11 @@ import android.support.v4.util.LongSparseArray; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException; import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType; import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing; import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException; import org.sufficientlysecure.keychain.util.Log; import java.util.Date; @@ -239,9 +239,9 @@ public class PassphraseCacheService extends Service { case PASSPHRASE_EMPTY: return ""; case UNAVAILABLE: - throw new NotFoundException("secret key for this subkey is not available"); + throw new ProviderHelper.NotFoundException("secret key for this subkey is not available"); case GNU_DUMMY: - throw new NotFoundException("secret key for stripped subkey is not available"); + throw new ProviderHelper.NotFoundException("secret key for stripped subkey is not available"); } // get cached passphrase |