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

pass import results through to viewkeyactivity on update

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-06-28 20:53:37 +02:00
parent 3acb7fb087
commit 6d7a9ec48a
5 changed files with 125 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -686,7 +686,7 @@ public class ProviderHelper {
if (Arrays.hashCode(publicRing.getEncoded())
== Arrays.hashCode(oldPublicRing.getEncoded())) {
log(LogLevel.OK, LogType.MSG_IP_SUCCESS_IDENTICAL);
return new SaveKeyringResult(SaveKeyringResult.RESULT_OK, mLog);
return new SaveKeyringResult(SaveKeyringResult.UPDATED, mLog);
}
} catch (NotFoundException e) {
// Not an issue, just means we are dealing with a new keyring.
@@ -771,7 +771,7 @@ public class ProviderHelper {
== Arrays.hashCode(oldSecretRing.getEncoded())) {
log(LogLevel.OK, LogType.MSG_IS_SUCCESS_IDENTICAL,
PgpKeyHelper.convertKeyIdToHex(masterKeyId) );
return new SaveKeyringResult(SaveKeyringResult.RESULT_OK, mLog);
return new SaveKeyringResult(SaveKeyringResult.UPDATED, mLog);
}
} catch (NotFoundException e) {
// Not an issue, just means we are dealing with a new keyring