diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-27 01:22:10 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-27 01:22:10 +0200 |
commit | f4ee71e3ef0dcacf691def97a94880b277a99496 (patch) | |
tree | 20cf9e8252a8efab967322db9f5809b5c1a3b00f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java | |
parent | a8782272b3db20ba6e88acab1d035d4699aa7166 (diff) | |
download | open-keychain-f4ee71e3ef0dcacf691def97a94880b277a99496.tar.gz open-keychain-f4ee71e3ef0dcacf691def97a94880b277a99496.tar.bz2 open-keychain-f4ee71e3ef0dcacf691def97a94880b277a99496.zip |
introduce EditKeyResult with transient UncachedKeyRing (half-baked!)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java index fcb6c027d..6fb0db0e5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java @@ -143,7 +143,7 @@ public abstract class OperationResults { // If we have a log and it's non-empty, show a View Log button if (button) { toast.setButtonIcon(R.drawable.ic_action_view_as_list, - activity.getResources().getString(R.string.import_view_log)); + activity.getResources().getString(R.string.view_log)); toast.setButtonTextColor(activity.getResources().getColor(R.color.black)); toast.setTextColor(activity.getResources().getColor(R.color.black)); toast.setOnClickWrapper(new OnClickWrapper("supercardtoast", @@ -167,6 +167,18 @@ public abstract class OperationResults { public static class EditKeyResult extends OperationResultParcel { + private transient UncachedKeyRing mRing; + + public EditKeyResult(int result, OperationLog log, + UncachedKeyRing ring) { + super(result, log); + mRing = ring; + } + + public UncachedKeyRing getRing() { + return mRing; + } + public EditKeyResult(Parcel source) { super(source); } |