mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-05 16:55:05 -05:00
fix regression bug with finish not called on activity but on fragment causing params to be not passed through
This commit is contained in:
parent
3d59796337
commit
a76169c39e
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user