cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImportKeys: Fix key preview when already downloaded

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-02 22:40:26 +02:00
parent 706840771a
commit 10ce910164
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@@ -945,6 +945,7 @@ public class ProviderHelper {
if (canPublicRing == null) { if (canPublicRing == null) {
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null); return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
} }
if (canKeyRings != null) canKeyRings.add(canPublicRing);
// Early breakout if nothing changed // Early breakout if nothing changed
if (Arrays.hashCode(publicRing.getEncoded()) if (Arrays.hashCode(publicRing.getEncoded())
@@ -960,7 +961,7 @@ public class ProviderHelper {
if (canPublicRing == null) { if (canPublicRing == null) {
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null); return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
} }
if (canKeyRings != null) canKeyRings.add(canPublicRing);
} }
// If there is a secret key, merge new data (if any) and save the key for later // If there is a secret key, merge new data (if any) and save the key for later
@@ -1001,7 +1002,6 @@ public class ProviderHelper {
if (!skipSave) { if (!skipSave) {
result = saveCanonicalizedPublicKeyRing(canPublicRing, progress, canSecretRing != null); result = saveCanonicalizedPublicKeyRing(canPublicRing, progress, canSecretRing != null);
} }
if (canKeyRings != null) canKeyRings.add(canPublicRing);
// Save the saved keyring (if any) // Save the saved keyring (if any)
if (canSecretRing != null) { if (canSecretRing != null) {
@@ -1071,6 +1071,7 @@ public class ProviderHelper {
if (canSecretRing == null) { if (canSecretRing == null) {
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null); return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
} }
if (canKeyRings != null) canKeyRings.add(canSecretRing);
// Early breakout if nothing changed // Early breakout if nothing changed
if (Arrays.hashCode(secretRing.getEncoded()) if (Arrays.hashCode(secretRing.getEncoded())
@@ -1102,7 +1103,7 @@ public class ProviderHelper {
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null); return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
} }
} }
if (canKeyRings != null) canKeyRings.add(canSecretRing);
} }
// Merge new data into public keyring as well, if there is any // Merge new data into public keyring as well, if there is any
@@ -1143,7 +1144,6 @@ public class ProviderHelper {
if (!skipSave) { if (!skipSave) {
result = saveCanonicalizedSecretKeyRing(canSecretRing); result = saveCanonicalizedSecretKeyRing(canSecretRing);
} }
if (canKeyRings != null) canKeyRings.add(canSecretRing);
return new SaveKeyringResult(result, mLog, canSecretRing); return new SaveKeyringResult(result, mLog, canSecretRing);

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
View File

@@ -321,7 +321,8 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
mKeyStates[mCurrent].mDownloaded = true; mKeyStates[mCurrent].mDownloaded = true;
changeState(mCurrent, true); changeState(mCurrent, true);
} else { } else {
throw new RuntimeException("getKey retrieved more than one key."); throw new RuntimeException("getKey retrieved more than one key ("
+ canKeyRings.size() + ")");
} }
} }
} }