moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-25 16:01:52 -05:00
Code Issues Releases Wiki Activity

fix regression bug with finish not called on activity but on fragment causing params to be not passed through

Browse Source
This commit is contained in:
Dominik Schürmann 2014-02-15 16:08:43 +01:00
parent 3d59796337
commit a76169c39e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
View File

@ -298,12 +298,12 @@ public class RemoteServiceActivity extends ActionBarActivity {
// return given params again, for calling the service method again // return given params again, for calling the service method again
Intent finishIntent = new Intent(); Intent finishIntent = new Intent();
finishIntent.putExtra(OpenPgpConstants.PI_RESULT_PARAMS, params); finishIntent.putExtra(OpenPgpConstants.PI_RESULT_PARAMS, params);
setResult(RESULT_OK, finishIntent); RemoteServiceActivity.this.setResult(RESULT_OK, finishIntent);
} else { } 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"); passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
} catch (PgpGeneralException e) { } 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 // return given params again, for calling the service method again
Intent finishIntent = new Intent(); Intent finishIntent = new Intent();
finishIntent.putExtra(OpenPgpConstants.PI_RESULT_PARAMS, params); finishIntent.putExtra(OpenPgpConstants.PI_RESULT_PARAMS, params);