aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ManageAccountActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-05-08 16:52:19 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-05-08 16:52:19 +0200
commit7fa61564b83b4a9e3403974b291750286a32d451 (patch)
tree99b717b178e91a06a0b1b98c1c4b5c7118f189e6 /src/eu/siacs/conversations/ui/ManageAccountActivity.java
parent99a56a2bde1af0e260f795a4c6fbdae63b7d5453 (diff)
better flow after returning from openkeychain for various actions
Diffstat (limited to 'src/eu/siacs/conversations/ui/ManageAccountActivity.java')
-rw-r--r--src/eu/siacs/conversations/ui/ManageAccountActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 8f4d9b9f..8fefa272 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -279,7 +279,7 @@ public class ManageAccountActivity extends XmppActivity {
} else if (item.getItemId()==R.id.mgmt_account_announce_pgp) {
if (activity.hasPgp()) {
mode.finish();
- announcePgp(selectedAccountForActionMode);
+ announcePgp(selectedAccountForActionMode,null);
}
} else if (item.getItemId() == R.id.mgmt_otr_key) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
@@ -458,8 +458,8 @@ public class ManageAccountActivity extends XmppActivity {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
if (requestCode == REQUEST_ANNOUNCE_PGP) {
- announcePgp(selectedAccountForActionMode);
- }
+ announcePgp(selectedAccountForActionMode,null);
+ }
}
}
}