From ef8838cbe326b986db54c23f30e89b1b872a3d2e Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 9 Sep 2024 20:13:11 +0200 Subject: [PATCH] add proxy settings to main menu if it is enabled --- .../securesms/ConversationListActivity.java | 14 ++++++-------- src/main/res/menu/text_secure_normal.xml | 5 +++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java index 7ba3876cd..606a57906 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java @@ -20,6 +20,7 @@ import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA; import static org.thoughtcrime.securesms.ConversationActivity.STARTING_POSITION_EXTRA; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ADDRESS; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS; +import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_ENABLED; import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent; import static org.thoughtcrime.securesms.util.RelayUtil.getDirectSharingChatId; import static org.thoughtcrime.securesms.util.RelayUtil.getSharedTitle; @@ -357,14 +358,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit if (!isRelayingMessageContent(this)) { inflater.inflate(R.menu.text_secure_normal, menu); - MenuItem item = menu.findItem(R.id.menu_global_map); - if (Prefs.isLocationStreamingEnabled(this)) { - item.setVisible(true); - } - - if (!Prefs.isLocationStreamingEnabled(this)) { - menu.findItem(R.id.menu_global_map).setVisible(false); - } + menu.findItem(R.id.menu_global_map).setVisible(Prefs.isLocationStreamingEnabled(this)); + menu.findItem(R.id.menu_proxy_settings).setVisible(DcHelper.getInt(this, CONFIG_SOCKS5_ENABLED) == 1); } super.onPrepareOptionsMenu(menu); @@ -430,6 +425,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit case R.id.menu_global_map: WebxdcActivity.openMaps(this, 0); return true; + case R.id.menu_proxy_settings: + startActivity(new Intent(this, ProxySettingsActivity.class)); + return true; case android.R.id.home: onBackPressed(); return true; diff --git a/src/main/res/menu/text_secure_normal.xml b/src/main/res/menu/text_secure_normal.xml index 84f738ddc..66d0a9e7f 100644 --- a/src/main/res/menu/text_secure_normal.xml +++ b/src/main/res/menu/text_secure_normal.xml @@ -7,6 +7,11 @@ android:icon="@drawable/baseline_qr_code_24" app:showAsAction="always"/> + +