aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-08 14:50:16 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-08 14:50:16 +0200
commitceea2667e8544b58acfc59f8d3284f4dcbd7cf7a (patch)
tree28d657f13500489a38eba53de3ea414cd01b6dd8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
parent055fb59ec34a986ea9f5620554b51c438d809361 (diff)
downloadopen-keychain-ceea2667e8544b58acfc59f8d3284f4dcbd7cf7a.tar.gz
open-keychain-ceea2667e8544b58acfc59f8d3284f4dcbd7cf7a.tar.bz2
open-keychain-ceea2667e8544b58acfc59f8d3284f4dcbd7cf7a.zip
introduce SingletonResult for... singleton results
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index 3de01adcd..703755457 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -51,7 +51,7 @@ import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.service.OperationResultParcel;
import org.sufficientlysecure.keychain.service.OperationResultParcel.LogLevel;
import org.sufficientlysecure.keychain.service.OperationResultParcel.LogType;
-import org.sufficientlysecure.keychain.service.OperationResultParcel.OperationLog;
+import org.sufficientlysecure.keychain.service.OperationResults.SingletonResult;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter;
@@ -580,14 +580,10 @@ public class EditKeyFragment extends LoaderFragment implements
/** Closes this activity, returning a result parcel with a single error log entry. */
void finishWithError(LogType reason) {
- // Prepare the log
- OperationLog log = new OperationLog();
- log.add(LogLevel.ERROR, reason, 0);
-
// Prepare an intent with an EXTRA_RESULT
Intent intent = new Intent();
intent.putExtra(OperationResultParcel.EXTRA_RESULT,
- new OperationResultParcel(OperationResultParcel.RESULT_ERROR, log));
+ new SingletonResult(SingletonResult.RESULT_ERROR, LogLevel.ERROR, reason));
// Finish with result
getActivity().setResult(EditKeyActivity.RESULT_OK, intent);