forgot adjustments in ProviderHelper

This commit is contained in:
Vincent Breitmoser 2014-10-03 04:42:01 +02:00
parent 5d6c2d90c2
commit 1ed6083a24

View File

@ -31,6 +31,7 @@ import android.support.v4.util.LongSparseArray;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKey; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKey;
@ -1074,8 +1075,8 @@ public class ProviderHelper {
// Set flag that we have a cached consolidation here // Set flag that we have a cached consolidation here
try { try {
Iterator<ParcelableKeyRing> itSecrets = cacheSecret.readCache(false); IteratorWithSize<ParcelableKeyRing> itSecrets = cacheSecret.readCache(false);
int numSecrets = cacheSecret.getNumEntries(); int numSecrets = itSecrets.getSize();
log(LogType.MSG_CON_REIMPORT_SECRET, numSecrets); log(LogType.MSG_CON_REIMPORT_SECRET, numSecrets);
mIndent += 1; mIndent += 1;
@ -1100,8 +1101,8 @@ public class ProviderHelper {
try { try {
Iterator<ParcelableKeyRing> itPublics = cachePublic.readCache(); IteratorWithSize<ParcelableKeyRing> itPublics = cachePublic.readCache();
int numPublics = cachePublic.getNumEntries(); int numPublics = itPublics.getSize();
log(LogType.MSG_CON_REIMPORT_PUBLIC, numPublics); log(LogType.MSG_CON_REIMPORT_PUBLIC, numPublics);
mIndent += 1; mIndent += 1;