diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-29 15:55:44 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-29 15:55:44 +0200 |
commit | 8d58a17aadd50320d1bdde4769cd05fe4c5750c2 (patch) | |
tree | ed3e0a636a3335dcadbd53e1eb3f0faa179ce630 /src | |
parent | fdc2dcd62effce445a148ed6ebfa8192cfb4fd13 (diff) |
provide access to show qr code from context menu in start conversation activity
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/StartConversationActivity.java | 17 | ||||
-rw-r--r-- | src/main/res/menu/contact_context.xml | 6 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java index d3fedbef4..2f72964fc 100644 --- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java @@ -347,11 +347,6 @@ public class StartConversationActivity extends XmppActivity implements XmppConne switchToConversation(conversation); } - protected void openConversationForContact() { - int position = contact_context_id; - openConversationForContact(position); - } - protected void openConversationForBookmark() { openConversationForBookmark(conference_context_id); } @@ -399,6 +394,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne switchToContactDetails(contact); } + protected void showQrForContact() { + int position = contact_context_id; + Contact contact = (Contact) contacts.get(position); + showQrCode("xmpp:" + contact.getJid().asBareJid().toEscapedString()); + } + protected void toggleContactBlock() { final int position = contact_context_id; BlockContactDialog.show(this, (Contact) contacts.get(position)); @@ -1061,12 +1062,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne return true; } switch (item.getItemId()) { - case R.id.context_start_conversation: - activity.openConversationForContact(); - break; case R.id.context_contact_details: activity.openDetailsForContact(); break; + case R.id.context_show_qr: + activity.showQrForContact(); + break; case R.id.context_contact_block_unblock: activity.toggleContactBlock(); break; diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml index 1940d176e..a4b372839 100644 --- a/src/main/res/menu/contact_context.xml +++ b/src/main/res/menu/contact_context.xml @@ -2,12 +2,12 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/context_start_conversation" - android:title="@string/start_conversation" /> - <item android:id="@+id/context_contact_details" android:title="@string/view_contact_details" /> <item + android:id="@+id/context_show_qr" + android:title="@string/show_qr_code" /> + <item android:id="@+id/context_contact_block_unblock" android:title="@string/block_contact" /> <item |