Merge pull request #28 from EyeSeeTea/bug-app_crashing_rotating_phone

Solved bug crashing app when rotating screen and service is null.
dhis2 · Jul 10, 2017 · 6615401 · 6615401
2 parents 9300111 + 3a56cc3
commit 6615401
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...va/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardViewPagerFragment.java b/...va/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardViewPagerFragment.java
@@ -122,11 +122,11 @@ public boolean onMenuItemClick(MenuItem item) {
         }
 
         boolean isLoading = isDhisServiceBound() &&
-                getDhisService().isJobRunning(DhisService.SYNC_DASHBOARDS)
+                (getDhisService().isJobRunning(DhisService.SYNC_DASHBOARDS)
                 ||
                 getDhisService().isJobRunning(DhisService.SYNC_DASHBOARD_CONTENT)
                 ||
-                getDhisService().isJobRunning(DhisService.PULL_DASHBOARD_IMAGES);
+                getDhisService().isJobRunning(DhisService.PULL_DASHBOARD_IMAGES));
         if ((savedInstanceState != null &&
                 savedInstanceState.getBoolean(IS_LOADING)) || isLoading) {
             mProgressBar.setVisibility(View.VISIBLE);