From f299fe7b1da2fb60edd269105059521a4f8436b5 Mon Sep 17 00:00:00 2001
From: Hocuri <hocceruser-github@gmx.de>
Date: Tue, 24 Dec 2019 17:40:52 +0100
Subject: [PATCH] Remove Scan Qr Code from dropdown menu in main activity

---
 res/menu/text_secure_normal.xml                     |  5 +----
 .../securesms/ConversationListActivity.java         | 13 +++----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml
index 1d75e1ddc..9be7293b7 100644
--- a/res/menu/text_secure_normal.xml
+++ b/res/menu/text_secure_normal.xml
@@ -3,16 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:title="@string/qrscan_title"
-          android:id="@+id/menu_qr_scan"
+          android:id="@+id/menu_qr"
           android:icon="@drawable/ic_ab_qr"
           app:showAsAction="always"/>
 
     <item android:title="@string/menu_new_chat"
           android:id="@+id/menu_new_chat" />
 
-    <item android:title="@string/qrshow_title"
-        android:id="@+id/menu_qr_show" />
-
     <item android:title="@string/menu_deaddrop"
           android:id="@+id/menu_deaddrop" />
 
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index e66e45f58..e54aa27f7 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -36,9 +36,8 @@ import com.google.zxing.integration.android.IntentResult;
 import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.map.MapActivity;
-import org.thoughtcrime.securesms.qr.QrCodeHandler;
 import org.thoughtcrime.securesms.qr.QrActivity;
-import org.thoughtcrime.securesms.qr.QrShowActivity;
+import org.thoughtcrime.securesms.qr.QrCodeHandler;
 import org.thoughtcrime.securesms.search.SearchFragment;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
@@ -197,8 +196,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     switch (item.getItemId()) {
       case R.id.menu_new_chat:          createChat();            return true;
       case R.id.menu_settings:          handleDisplaySettings(); return true;
-      case R.id.menu_qr_scan:           handleQrScan();          return true;
-      case R.id.menu_qr_show:           handleQrShow();          return true;
+      case R.id.menu_qr:                handleQr();              return true;
       case R.id.menu_deaddrop:          handleDeaddrop();        return true;
       case R.id.menu_global_map:        handleShowMap();         return true;
       case android.R.id.home:           onBackPressed();         return true;
@@ -234,15 +232,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
       startActivity(intent);
   }
 
-  private void handleQrScan() {
+  private void handleQr() {
     new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan();
   }
 
-  private void handleQrShow() {
-    Intent qrIntent = new Intent(this, QrShowActivity.class);
-    startActivity(qrIntent);
-  }
-
   @Override
   public void onCreateConversation(int chatId) {
     openConversation(chatId, -1);