Fix for #48

Author: milovanderlinden

app/src/main/java/org/open311/android/MainActivity.java

@@ -90,6 +90,21 @@ public boolean onCreateOptionsMenu(Menu menu) {
         final List<Server> servers = new Servers().getCollection();
         getMenuInflater().inflate(R.menu.main, menu);
         MenuItem mapItem = menu.findItem(R.id.setting_map);
+        if (currentServer.getMap() == null || currentServer.getMap().getRequestMapEnabled()) {
+                mapItem.setVisible(true);
+                mapItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem menuItem) {
+                        //Show the map
+                        Intent intent = new Intent(MainActivity.this, MapActivity.class);
+                        startActivityForResult(intent, LOCATION_REQUEST);
+                        return false;
+                    }
+                });
+        } else {
+            mapItem.setVisible(false);
+        }
+
         MenuItem serverItem = menu.findItem(R.id.setting_general);
         serverItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
             @Override
@@ -141,15 +156,7 @@ public void onClick(DialogInterface dialog, int id) {
                 return false;
             }
         });
-        mapItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem menuItem) {
-                //Show the map
-                Intent intent = new Intent(MainActivity.this, MapActivity.class);
-                startActivityForResult(intent, LOCATION_REQUEST);
-                return false;
-            }
-        });
+
         return true;
     }
 

app/src/main/res/menu/main.xml

@@ -2,15 +2,16 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/setting_general"
+        android:id="@+id/setting_map"
+        android:icon="@drawable/ic_map_white"
         android:orderInCategory="1"
-        android:icon="@drawable/ic_settings_white"
-        android:title="@string/setting_general"
+        android:title="@string/setting_map"
         app:showAsAction="ifRoom" />
     <item
-        android:id="@+id/setting_map"
+        android:id="@+id/setting_general"
+        android:icon="@drawable/ic_settings_white"
         android:orderInCategory="2"
-        android:icon="@drawable/ic_map_white"
-        android:title="@string/setting_map"
+        android:title="@string/setting_general"
         app:showAsAction="ifRoom" />
+
 </menu>