let 'settings' be the last menu entry, hide 'global map' entry if location-streaming is disabled

This commit is contained in:
B. Petersen
2019-03-23 20:00:48 +01:00
parent 4a9cfcd5b0
commit 3c3a67ea0a
2 changed files with 8 additions and 3 deletions
+3 -3
View File
@@ -16,10 +16,10 @@
<item android:title="@string/menu_deaddrop"
android:id="@+id/menu_deaddrop" />
<item android:title="@string/menu_show_global_map"
android:id="@+id/menu_global_map" />
<item android:title="@string/menu_settings"
android:id="@+id/menu_settings" />
<item android:title="@string/menu_show_global_map"
android:id="@+id/menu_global_map" />
</menu>
@@ -37,6 +37,7 @@ import org.thoughtcrime.securesms.search.SearchFragment;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.Prefs;
import static org.thoughtcrime.securesms.map.MapDataManager.ALL_CHATS_GLOBAL_MAP;
@@ -92,6 +93,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
inflater.inflate(R.menu.text_secure_normal, menu);
if (!Prefs.isLocationStreamingEnabled(this)) {
menu.findItem(R.id.menu_global_map).setVisible(false);
}
super.onPrepareOptionsMenu(menu);
return true;
}