Prosposed fix for #425. Reloads history fragment when main activity r…

…esumes. Consolidated 'if statement' per Codacy suggestion
Glucosio · Jul 23, 2018 · 963b7a1 · 963b7a1
1 parent 13bb9b8
commit 963b7a1
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/app/src/main/java/org/glucosio/android/activity/MainActivity.java b/app/src/main/java/org/glucosio/android/activity/MainActivity.java
@@ -283,14 +283,12 @@ protected void onResume() {
          */
         super.onResume();
 
-        if (viewPager != null) {
+        if (viewPager != null && homePagerAdapter != null) {
             int currentPage = viewPager.getCurrentItem();
             if (currentPage == 1) {  // assumption - history tab is always position 1
-                if (homePagerAdapter != null) {
-                    HistoryFragment historyFragment = homePagerAdapter.getHistoryFragment();
-                    if (historyFragment != null) {
-                        historyFragment.reloadFragmentAdapter();
-                    }
+                HistoryFragment historyFragment = homePagerAdapter.getHistoryFragment();
+                if (historyFragment != null) {
+                    historyFragment.reloadFragmentAdapter();
                 }
             }
         }