diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:45:21 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:45:21 +0200 |
| commit | 270c7ffa1fb3c796449eac832e6d4795b6e40fd3 (patch) | |
| tree | aa90aa34fe5d294eaa19954c5222841bae3c06ed /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | |
| parent | 098823bd525bdbf215060dba1ed248af853bbfac (diff) | |
| parent | 34fca975d764cfdda61ae30c31fbb0ce81807df6 (diff) | |
| download | open-keychain-270c7ffa1fb3c796449eac832e6d4795b6e40fd3.tar.gz open-keychain-270c7ffa1fb3c796449eac832e6d4795b6e40fd3.tar.bz2 open-keychain-270c7ffa1fb3c796449eac832e6d4795b6e40fd3.zip | |
Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into Valodim-db-overhaul
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index 69c2c8bf2..49ce8d3bb 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -194,7 +194,7 @@ public class PgpImportExport { updateProgress(progress * 100 / masterKeyIdsSize, 100); PGPPublicKeyRing publicKeyRing = - ProviderHelper.getPGPPublicKeyRingByMasterKeyId(mContext, pubKeyMasterId); + ProviderHelper.getPGPPublicKeyRing(mContext, pubKeyMasterId); if (publicKeyRing != null) { publicKeyRing.encode(arOutStream); @@ -217,7 +217,7 @@ public class PgpImportExport { updateProgress(progress * 100 / masterKeyIdsSize, 100); PGPSecretKeyRing secretKeyRing = - ProviderHelper.getPGPSecretKeyRingByMasterKeyId(mContext, secretKeyMasterId); + ProviderHelper.getPGPSecretKeyRing(mContext, secretKeyMasterId); if (secretKeyRing != null) { secretKeyRing.encode(arOutStream); |