diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-04 01:04:28 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-04 01:05:53 +0200 |
commit | 59f4b4e3e7cc27981e66f140030bef9a3fce3d25 (patch) | |
tree | 5afefe6b60e47fabfebbfbae1a02535547bdef00 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
parent | 2620e0bfc8cbbdfb304629dbcf8d3a9d2d0b35ae (diff) | |
download | open-keychain-59f4b4e3e7cc27981e66f140030bef9a3fce3d25.tar.gz open-keychain-59f4b4e3e7cc27981e66f140030bef9a3fce3d25.tar.bz2 open-keychain-59f4b4e3e7cc27981e66f140030bef9a3fce3d25.zip |
db-overhaul: minor stuff, mostly ProviderHelper
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 007fbc99b..ccae6b2f2 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -35,7 +35,8 @@ import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyResult; import org.sufficientlysecure.keychain.pgp.PgpSignEncrypt; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; -import org.sufficientlysecure.keychain.provider.KeychainContract; +import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; +import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAccounts; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.ui.RemoteServiceActivity; import org.sufficientlysecure.keychain.service.PassphraseCacheService; @@ -351,7 +352,7 @@ public class OpenPgpService extends RemoteService { try { long keyId = data.getLongExtra(OpenPgpApi.EXTRA_KEY_ID, 0); - if (ProviderHelper.getPGPPublicKeyByKeyId(this, keyId) == null) { + if (ProviderHelper.getPGPPublicKeyRing(this, keyId) == null) { Intent result = new Intent(); // If keys are not in db we return an additional PendingIntent @@ -460,7 +461,7 @@ public class OpenPgpService extends RemoteService { String currentPkg = getCurrentCallingPackage(); Set<Long> allowedKeyIds = ProviderHelper.getAllKeyIdsForApp(mContext, - KeychainContract.ApiAccounts.buildBaseUri(currentPkg)); + ApiAccounts.buildBaseUri(currentPkg)); return decryptAndVerifyImpl(data, input, output, allowedKeyIds); } else if (OpenPgpApi.ACTION_GET_KEY.equals(action)) { return getKeyImpl(data); |