diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-08-05 12:36:18 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-08-05 12:36:18 +0200 |
commit | 3f55a61c250c5b9dd81dd4dcfd4c9531369d2152 (patch) | |
tree | 91cd1cb9076fe04a5a063938d8584c99bdc91649 /src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | |
parent | 7414a4e5a2567b312099e82f818d46608d8bbdfb (diff) |
introduced config flag to show attachment button instead of quick actions
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationsActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index f2e4dc2b6..6067d03f9 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -842,22 +842,19 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio } PopupMenu popup = new PopupMenu(this, view); popup.inflate(R.menu.verification_choices); - popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - Intent intent = new Intent(ConversationsActivity.this, VerifyOTRActivity.class); - intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT); - intent.putExtra("contact", conversation.getContact().getJid().asBareJid().toString()); - intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString()); - switch (menuItem.getItemId()) { - case R.id.ask_question: - intent.putExtra("mode", VerifyOTRActivity.MODE_ASK_QUESTION); - break; - } - startActivity(intent); - overridePendingTransition(R.animator.fade_in, R.animator.fade_out); - return true; + popup.setOnMenuItemClickListener(menuItem -> { + Intent intent = new Intent(ConversationsActivity.this, VerifyOTRActivity.class); + intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT); + intent.putExtra("contact", conversation.getContact().getJid().asBareJid().toString()); + intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString()); + switch (menuItem.getItemId()) { + case R.id.ask_question: + intent.putExtra("mode", VerifyOTRActivity.MODE_ASK_QUESTION); + break; } + startActivity(intent); + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); + return true; }); popup.show(); } |