Skip to content

Commit 318b046

Browse files
Extract code into a method
1 parent 5e7cf88 commit 318b046

File tree

1 file changed

+12
-13
lines changed
  • OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk

1 file changed

+12
-13
lines changed

OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ public void restoreActionBar() {
408408
}
409409

410410
@Override
411-
public boolean onNavigationItemSelected(MenuItem menuItem) {
411+
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
412412
if (menuItem == null) {
413413
return false;
414414
}
@@ -442,20 +442,11 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
442442
} else if (itemId == R.id.navigation_item_onboarding) {
443443
startActivity(new Intent(this, OnboardingActivity.class));
444444
} else if (itemId == R.id.navigation_item_activities) {
445-
try {
446-
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_activities_link))));
447-
} catch (ActivityNotFoundException ignored) {
448-
}
445+
safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_activities_link))));
449446
} else if (itemId == R.id.navigation_item_get_science_kit) {
450-
try {
451-
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link))));
452-
} catch (ActivityNotFoundException ignored) {
453-
}
447+
safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link))));
454448
} else if (itemId == R.id.navigation_item_get_help) {
455-
try {
456-
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link))));
457-
} catch (ActivityNotFoundException ignored) {
458-
}
449+
safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link))));
459450
} else if (itemId == R.id.navigation_item_settings) {
460451
startActivity(new Intent(this, ArduinoSettingsActivity.class));
461452
} else {
@@ -501,6 +492,14 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
501492
return false;
502493
}
503494

495+
private void safeStartActivity(@NonNull Intent intent) {
496+
try {
497+
startActivity(intent);
498+
} catch (ActivityNotFoundException exception) {
499+
Log.e(TAG, "", exception);
500+
}
501+
}
502+
504503
private CharSequence getTitleToRestore(MenuItem menuItem) {
505504
if (menuItem.getItemId() == R.id.navigation_item_experiments) {
506505
return getResources().getString(R.string.app_name);

0 commit comments

Comments
 (0)