diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-03 04:42:01 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-03 04:42:01 +0200 |
commit | 1ed6083a2495f74c539df74d172e091cc3e39ece (patch) | |
tree | 2ece9a2f611176770b4badd6d52fa888ad9bc04a | |
parent | 5d6c2d90c209ba6e00f049fe93a85085964a95ae (diff) | |
download | open-keychain-1ed6083a2495f74c539df74d172e091cc3e39ece.tar.gz open-keychain-1ed6083a2495f74c539df74d172e091cc3e39ece.tar.bz2 open-keychain-1ed6083a2495f74c539df74d172e091cc3e39ece.zip |
forgot adjustments in ProviderHelper
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 0ca9c60c6..6b96a1e6e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -31,6 +31,7 @@ import android.support.v4.util.LongSparseArray; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; +import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize; import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKey; @@ -1074,8 +1075,8 @@ public class ProviderHelper { // Set flag that we have a cached consolidation here try { - Iterator<ParcelableKeyRing> itSecrets = cacheSecret.readCache(false); - int numSecrets = cacheSecret.getNumEntries(); + IteratorWithSize<ParcelableKeyRing> itSecrets = cacheSecret.readCache(false); + int numSecrets = itSecrets.getSize(); log(LogType.MSG_CON_REIMPORT_SECRET, numSecrets); mIndent += 1; @@ -1100,8 +1101,8 @@ public class ProviderHelper { try { - Iterator<ParcelableKeyRing> itPublics = cachePublic.readCache(); - int numPublics = cachePublic.getNumEntries(); + IteratorWithSize<ParcelableKeyRing> itPublics = cachePublic.readCache(); + int numPublics = itPublics.getSize(); log(LogType.MSG_CON_REIMPORT_PUBLIC, numPublics); mIndent += 1; |