diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 16:08:43 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 16:08:43 +0100 |
commit | a76169c39e77e85c174707cad0f992b1920e0c0f (patch) | |
tree | 96786d2e035c2d5ccbd759fca8599a6c1dbd1309 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 3d59796337e99c0153cf173eba617d156f158d3c (diff) | |
download | open-keychain-a76169c39e77e85c174707cad0f992b1920e0c0f.tar.gz open-keychain-a76169c39e77e85c174707cad0f992b1920e0c0f.tar.bz2 open-keychain-a76169c39e77e85c174707cad0f992b1920e0c0f.zip |
fix regression bug with finish not called on activity but on fragment causing params to be not passed through
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java | 8 |
1 files 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); |