From ceea2667e8544b58acfc59f8d3284f4dcbd7cf7a Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 8 Sep 2014 14:50:16 +0200 Subject: introduce SingletonResult for... singleton results --- .../java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java') 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); -- cgit v1.2.3