diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
index 13b3fc407..c0f25cfd9 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms;
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_PROXY_ENABLED;
import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS;
import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;
import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
@@ -353,6 +354,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
@Override
public void onResume() {
super.onResume();
+ invalidateOptionsMenu();
DirectShareUtil.triggerRefreshDirectShare(this);
}
@@ -364,7 +366,14 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
if (!isRelayingMessageContent(this)) {
inflater.inflate(R.menu.text_secure_normal, menu);
menu.findItem(R.id.menu_global_map).setVisible(Prefs.isLocationStreamingEnabled(this));
- menu.findItem(R.id.menu_proxy_settings).setVisible(!TextUtils.isEmpty(DcHelper.get(this, CONFIG_PROXY_URL)));
+ MenuItem proxyItem = menu.findItem(R.id.menu_proxy_settings);
+ if (TextUtils.isEmpty(DcHelper.get(this, CONFIG_PROXY_URL))) {
+ proxyItem.setVisible(false);
+ } else {
+ boolean proxyEnabled = DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1;
+ proxyItem.setIcon(proxyEnabled? R.drawable.ic_proxy_enabled_24 : R.drawable.ic_proxy_disabled_24);
+ proxyItem.setVisible(true);
+ }
}
super.onPrepareOptionsMenu(menu);
diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index 40cd7b100..b764af3ad 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -1,5 +1,8 @@
package org.thoughtcrime.securesms;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;
+
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
@@ -138,6 +141,14 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear();
getMenuInflater().inflate(R.menu.instant_onboarding_menu, menu);
+ MenuItem proxyItem = menu.findItem(R.id.menu_proxy_settings);
+ if (TextUtils.isEmpty(DcHelper.get(this, CONFIG_PROXY_URL))) {
+ proxyItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ } else {
+ boolean proxyEnabled = DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1;
+ proxyItem.setIcon(proxyEnabled? R.drawable.ic_proxy_enabled_24 : R.drawable.ic_proxy_disabled_24);
+ proxyItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ }
return super.onPrepareOptionsMenu(menu);
}
@@ -241,6 +252,12 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
}
}
+ @Override
+ public void onResume() {
+ super.onResume();
+ invalidateOptionsMenu();
+ }
+
@Override
public void onDestroy() {
super.onDestroy();
diff --git a/src/main/res/drawable/baseline_proxy_24.xml b/src/main/res/drawable/baseline_proxy_24.xml
deleted file mode 100644
index 5064d8920..000000000
--- a/src/main/res/drawable/baseline_proxy_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/src/main/res/drawable/ic_proxy_disabled_24.xml b/src/main/res/drawable/ic_proxy_disabled_24.xml
new file mode 100644
index 000000000..287bc46d2
--- /dev/null
+++ b/src/main/res/drawable/ic_proxy_disabled_24.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/src/main/res/drawable/ic_proxy_enabled_24.xml b/src/main/res/drawable/ic_proxy_enabled_24.xml
new file mode 100644
index 000000000..81c20e883
--- /dev/null
+++ b/src/main/res/drawable/ic_proxy_enabled_24.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/src/main/res/menu/instant_onboarding_menu.xml b/src/main/res/menu/instant_onboarding_menu.xml
index c30ec587c..1eb1ffeb9 100644
--- a/src/main/res/menu/instant_onboarding_menu.xml
+++ b/src/main/res/menu/instant_onboarding_menu.xml
@@ -6,6 +6,7 @@