From d41c5bbbc15428f82e16c2c3f931bbb058a2e6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 1 Jul 2015 14:39:47 +0200 Subject: Merge logs in create key --- .../keychain/ui/CreateKeyFinalFragment.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java index 7a083ba5e..e67715988 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Dominik Schürmann + * Copyright (C) 2014-2015 Dominik Schürmann * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -263,7 +263,6 @@ public class CreateKeyFinalFragment extends Fragment { mCreateOpHelper = new CryptoOperationHelper<>(this, createKeyCallback, R.string.progress_building_key); - mCreateOpHelper.cryptoOperation(); } @@ -318,14 +317,17 @@ public class CreateKeyFinalFragment extends Fragment { } public void handleResult(EditKeyResult result) { + // merge logs of createKey with moveToCard + saveKeyResult.getLog().add(result, 0); + if (result.mMasterKeyId != null && mUploadCheckbox.isChecked()) { // result will be displayed after upload - uploadKey(result); + uploadKey(saveKeyResult); return; } Intent data = new Intent(); - data.putExtra(OperationResult.EXTRA_RESULT, result); + data.putExtra(OperationResult.EXTRA_RESULT, saveKeyResult); getActivity().setResult(Activity.RESULT_OK, data); getActivity().finish(); } @@ -372,11 +374,9 @@ public class CreateKeyFinalFragment extends Fragment { } public void handleResult(ExportResult result) { - // TODO: upload operation needs a result! "result" is not currenlty used - // TODO: then combine these results (saveKeyResult and update op result) - //if (result.getResult() == OperationResultParcel.RESULT_OK) { - //Notify.create(getActivity(), R.string.key_send_success, - //Notify.Style.OK).show(); + // TODO: ExportOperation UPLOAD_KEYSERVER needs logs! + // TODO: then merge logs here! + //saveKeyResult.getLog().add(result, 0); Intent data = new Intent(); data.putExtra(OperationResult.EXTRA_RESULT, saveKeyResult); -- cgit v1.2.3