From a76169c39e77e85c174707cad0f992b1920e0c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 15 Feb 2014 16:08:43 +0100 Subject: fix regression bug with finish not called on activity but on fragment causing params to be not passed through --- .../keychain/service/remote/RemoteServiceActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java index 669c5c28f..7c8eaab62 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java @@ -298,12 +298,12 @@ public class RemoteServiceActivity extends ActionBarActivity { // return given params again, for calling the service method again Intent finishIntent = new Intent(); finishIntent.putExtra(OpenPgpConstants.PI_RESULT_PARAMS, params); - setResult(RESULT_OK, finishIntent); + RemoteServiceActivity.this.setResult(RESULT_OK, finishIntent); } else { - setResult(RESULT_CANCELED); + RemoteServiceActivity.this.setResult(RESULT_CANCELED); } - finish(); + RemoteServiceActivity.this.finish(); } }; @@ -316,7 +316,7 @@ public class RemoteServiceActivity extends ActionBarActivity { passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog"); } catch (PgpGeneralException e) { - Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!"); + Log.d(Constants.TAG, "No passphrase for this secret key, do pgp operation directly!"); // return given params again, for calling the service method again Intent finishIntent = new Intent(); finishIntent.putExtra(OpenPgpConstants.PI_RESULT_PARAMS, params); -- cgit v1.2.3