diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
commit | 0bfac9989f801aa93d8bc336307d60b817995688 (patch) | |
tree | 862660bd27a28a14db7d9fa2a52bebaf41b6f57e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | e10cbc54c606563b2d06f083bca17119ca585127 (diff) | |
parent | f72a07690c257fefb28aed6645ad898fded63a78 (diff) | |
download | open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.gz open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.bz2 open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.zip |
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index dbc557f9a..4a606a1b3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.OtherHelper; import org.sufficientlysecure.keychain.helper.Preferences; -import org.sufficientlysecure.keychain.keyimport.FileImportCache; +import org.sufficientlysecure.keychain.util.FileImportCache; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; @@ -503,7 +503,7 @@ public class ImportKeysActivity extends ActionBarActivity { // to prevent Java Binder problems on heavy imports // read FileImportCache for more info. try { - FileImportCache cache = new FileImportCache(this); + FileImportCache<ParcelableKeyRing> cache = new FileImportCache<ParcelableKeyRing>(this); cache.writeCache(selectedEntries); intent.putExtra(KeychainIntentService.EXTRA_DATA, data); |