sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed NullPointerException

Browse Source
This commit is contained in:
Caesar2011
2018-11-21 17:53:49 +01:00
parent 5209491287
commit 4c012ed2ba
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -16,7 +16,6 @@ import org.jetbrains.annotations.NotNull;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import java.util.zip.Inflater;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
@@ -407,7 +406,7 @@ public class MainActivity extends AppCompatActivity
} }
private void setNavigationSelection() { private void setNavigationSelection() {
MenuItem item; MenuItem item = null;
switch (mFragmentPage) { switch (mFragmentPage) {
case FRAGMENT_MODULES_DETAILS: case FRAGMENT_MODULES_DETAILS:
getKVV().modules().list().find(mFragmentData, success -> { getKVV().modules().list().find(mFragmentData, success -> {
@@ -415,19 +414,19 @@ public class MainActivity extends AppCompatActivity
//noinspection ConstantConditions //noinspection ConstantConditions
String title = success == null ? null : success.title; String title = success == null ? null : success.title;
for (int k = 0; k < size; k++) { for (int k = 0; k < size; k++) {
mNavigationView.getMenu().getItem(k).setChecked(mNavigationView.getMenu().getItem(k).getTitle().equals(title)); MenuItem menuItem = mNavigationView.getMenu().getItem(k);
if (menuItem.getTitle().equals(title)) {
menuItem.setChecked(true);
break;
}
} }
}, log::e); }, log::e);
break; return;
case FRAGMENT_MODULES: case FRAGMENT_MODULES:
item = mNavigationView.getMenu().findItem(R.id.nav_modules); item = mNavigationView.getMenu().findItem(R.id.nav_modules);
if (item != null)
item.setChecked(true);
break; break;
case FRAGMENT_SCHEDULE: case FRAGMENT_SCHEDULE:
item = mNavigationView.getMenu().findItem(R.id.nav_schedule); item = mNavigationView.getMenu().findItem(R.id.nav_schedule);
if (item != null)
item.setChecked(true);
break; break;
case FRAGMENT_CANTEENS_DETAILS: case FRAGMENT_CANTEENS_DETAILS:
getCanteenBrowser().getCanteens(success -> { getCanteenBrowser().getCanteens(success -> {
@@ -436,22 +435,28 @@ public class MainActivity extends AppCompatActivity
//noinspection ConstantConditions //noinspection ConstantConditions
String title = canteen == null ? null : canteen.getName(); String title = canteen == null ? null : canteen.getName();
for (int k = 0; k < size; k++) { for (int k = 0; k < size; k++) {
mNavigationView.getMenu().getItem(k).setChecked(mNavigationView.getMenu().getItem(k).getTitle().equals(title)); MenuItem menuItem = mNavigationView.getMenu().getItem(k);
if (menuItem.getTitle().equals(title)) {
menuItem.setChecked(true);
break;
}
} }
}, log::e); }, log::e);
break; return;
case FRAGMENT_CANTEENS: case FRAGMENT_CANTEENS:
mNavigationView.getMenu().findItem(R.id.nav_canteens).setChecked(true); item = mNavigationView.getMenu().findItem(R.id.nav_canteens);
break; break;
case FRAGMENT_NEWS: case FRAGMENT_NEWS:
mNavigationView.getMenu().findItem(R.id.nav_news).setChecked(true); item = mNavigationView.getMenu().findItem(R.id.nav_news);
break; break;
case FRAGMENT_PREFERENCES: case FRAGMENT_PREFERENCES:
mNavigationView.getMenu().findItem(R.id.nav_settings).setChecked(true); item = mNavigationView.getMenu().findItem(R.id.nav_settings);
break; break;
default: // FRAGMENT_STARTUP / FRAGMENT_LOGIN default: // FRAGMENT_STARTUP / FRAGMENT_LOGIN
break; break;
} }
if (item != null)
item.setChecked(true);
} }
private void setNavigationHeader(boolean isLoggedIn) { private void setNavigationHeader(boolean isLoggedIn) {