awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Remove Scan Qr Code from dropdown menu in main activity

Browse Source
This commit is contained in:
Hocuri
2019-12-24 17:40:52 +01:00
committed by B. Petersen
parent f527bd2d26
commit f299fe7b1d
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/menu/text_secure_normal.xml
+1 -4
View File
@@ -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" />
src/org/thoughtcrime/securesms/ConversationListActivity.java
+3 -10
View File
@@ -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);