diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 02:29:04 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 02:29:04 +0200 |
commit | 3af97bf0e6a711679343a86823b6639917787218 (patch) | |
tree | 605849f3bf7f97fbcf3b5330f7b896ff6d028893 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java | |
parent | 510999c3a2de2475f7828e283d4f01e46a4fe9f7 (diff) | |
download | open-keychain-3af97bf0e6a711679343a86823b6639917787218.tar.gz open-keychain-3af97bf0e6a711679343a86823b6639917787218.tar.bz2 open-keychain-3af97bf0e6a711679343a86823b6639917787218.zip |
some cleanup and fix for back button in ImportKeysActivity (fixes #1372)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java index 847d76f30..9529d8689 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java @@ -87,9 +87,7 @@ public abstract class BaseActivity extends AppCompatActivity { mToolbar.setNavigationOnClickListener(cancelOnClickListener); } - /** - * Close button only - */ + /** Close button only */ protected void setFullScreenDialogClose(View.OnClickListener cancelOnClickListener, boolean white) { if (white) { setActionBarIcon(R.drawable.ic_close_white_24dp); @@ -104,6 +102,17 @@ public abstract class BaseActivity extends AppCompatActivity { setFullScreenDialogClose(cancelOnClickListener, true); } + /** Close button only, with finish-action and given return status, white. */ + protected void setFullScreenDialogClose(final int result, boolean white) { + setFullScreenDialogClose(new View.OnClickListener() { + @Override + public void onClick(View v) { + setResult(result); + finish(); + } + }, white); + } + /** * Inflate custom design with two buttons using drawables. * This does not conform to the Material Design Guidelines, but we deviate here as this is used |