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

Positive if-else + comments

Browse Source
This commit is contained in:
Dominik Schürmann
2016-12-28 19:00:25 +01:00
parent 1bf4ccf67c
commit f128653de4
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1001,11 +1001,12 @@ public class ProviderHelper {
} }
int result; int result;
if (!skipSave) { if (skipSave) {
result = saveCanonicalizedPublicKeyRing(canPublicRing, progress, canSecretRing != null); // skip save method, set fixed result
} else {
result = SaveKeyringResult.SAVED_PUBLIC result = SaveKeyringResult.SAVED_PUBLIC
| (alreadyExists ? SaveKeyringResult.UPDATED : 0); | (alreadyExists ? SaveKeyringResult.UPDATED : 0);
} else {
result = saveCanonicalizedPublicKeyRing(canPublicRing, progress, canSecretRing != null);
} }
// Save the saved keyring (if any) // Save the saved keyring (if any)
@@ -1013,10 +1014,11 @@ public class ProviderHelper {
progress.setProgress(LogType.MSG_IP_REINSERT_SECRET.getMsgId(), 90, 100); progress.setProgress(LogType.MSG_IP_REINSERT_SECRET.getMsgId(), 90, 100);
int secretResult; int secretResult;
if (!skipSave) { if (skipSave) {
secretResult = saveCanonicalizedSecretKeyRing(canSecretRing); // skip save method, set fixed result
} else {
secretResult = SaveKeyringResult.SAVED_SECRET; secretResult = SaveKeyringResult.SAVED_SECRET;
} else {
secretResult = saveCanonicalizedSecretKeyRing(canSecretRing);
} }
if ((secretResult & SaveKeyringResult.RESULT_ERROR) != SaveKeyringResult.RESULT_ERROR) { if ((secretResult & SaveKeyringResult.RESULT_ERROR) != SaveKeyringResult.RESULT_ERROR) {
@@ -1138,10 +1140,11 @@ public class ProviderHelper {
} }
int publicResult; int publicResult;
if (!skipSave) { if (skipSave) {
publicResult = saveCanonicalizedPublicKeyRing(canPublicRing, progress, true); // skip save method, set fixed result
} else {
publicResult = SaveKeyringResult.SAVED_PUBLIC; publicResult = SaveKeyringResult.SAVED_PUBLIC;
} else {
publicResult = saveCanonicalizedPublicKeyRing(canPublicRing, progress, true);
} }
if ((publicResult & SaveKeyringResult.RESULT_ERROR) == SaveKeyringResult.RESULT_ERROR) { if ((publicResult & SaveKeyringResult.RESULT_ERROR) == SaveKeyringResult.RESULT_ERROR) {
@@ -1151,11 +1154,12 @@ public class ProviderHelper {
progress.setProgress(LogType.MSG_IP_REINSERT_SECRET.getMsgId(), 90, 100); progress.setProgress(LogType.MSG_IP_REINSERT_SECRET.getMsgId(), 90, 100);
int result; int result;
if (!skipSave) { if (skipSave) {
result = saveCanonicalizedSecretKeyRing(canSecretRing); // skip save method, set fixed result
} else {
result = SaveKeyringResult.SAVED_SECRET result = SaveKeyringResult.SAVED_SECRET
| (alreadyExists ? SaveKeyringResult.UPDATED : 0); | (alreadyExists ? SaveKeyringResult.UPDATED : 0);
} else {
result = saveCanonicalizedSecretKeyRing(canSecretRing);
} }
return new SaveKeyringResult(result, mLog, canSecretRing); return new SaveKeyringResult(result, mLog, canSecretRing);