From b0aff19ae0cdb44f46a22f433d5c5efd60253aa9 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 23 Mar 2019 21:57:55 +0100 Subject: [PATCH] hide global map menu entry if necessary --- res/menu/text_secure_normal.xml | 4 +++- src/org/thoughtcrime/securesms/ConversationListActivity.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml index 55acd399e..1d75e1ddc 100644 --- a/res/menu/text_secure_normal.xml +++ b/res/menu/text_secure_normal.xml @@ -17,7 +17,9 @@ android:id="@+id/menu_deaddrop" /> + android:id="@+id/menu_global_map" + android:visible="false" + /> diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index 396a88ca4..bf4e69f99 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -92,6 +92,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit menu.clear(); 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);