Fixed crash on click on map if list is not yet loaded.

jklmnn · Jul 6, 2017 · 38b9db7 · 38b9db7
1 parent 1c0e000
commit 38b9db7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/src/main/java/de/jkliemann/parkendd/MainActivity.java b/app/src/main/java/de/jkliemann/parkendd/MainActivity.java
@@ -38,13 +38,16 @@ public class MainActivity extends AppCompatActivity implements LoaderInterface,
     private Loader cityLoader;
     private City city;
     private NavigationView navigationView;
+    private MenuItem map_action;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((ParkenDD) getApplication()).getTracker().trackAppDownload();
         setContentView(R.layout.activity_main);
 
+        //navigationView.getMenu().getItem(R.id.action_map).setEnabled(false);
+
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
@@ -152,6 +155,7 @@ public void onLoaderFinished(String data[], Loader loader){
                 String locDate = dateFormat.format(city.last_updated());
                 String locTime = timeFormat.format(city.last_updated());
                 Error.showLongErrorToast(this, getString(R.string.last_update) + ": " + locDate + " " + locTime);
+                map_action.setEnabled(true);
                 onProgressUpdated();
             }catch (JSONException e){
                 e.printStackTrace();
@@ -291,6 +295,8 @@ private void setList(City CITY){
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.menu_main, menu);
+        map_action = menu.findItem(R.id.action_map);
+        map_action.setEnabled(false);
         return true;
     }
 
@@ -311,6 +317,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             startActivity(about);
         }
         if(id == R.id.action_refresh){
+            map_action.setEnabled(false);
             pg.setMax(4);
             pg.setProgress(0);
             pg.setVisibility(View.VISIBLE);