From 963b7a1593d6ea02a0bc6a286e944747f29eec90 Mon Sep 17 00:00:00 2001 From: Chris Walters Date: Mon, 23 Jul 2018 10:22:30 +0100 Subject: [PATCH] Prosposed fix for #425. Reloads history fragment when main activity resumes. Consolidated 'if statement' per Codacy suggestion --- .../org/glucosio/android/activity/MainActivity.java | 10 ++++------ 1 file changed, 4 insertions(+), 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 index 61204178..f0eb4bd9 100644 --- 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(); } } }