From c02408c2a5b18bbcfcf483c235966db2d4a00457 Mon Sep 17 00:00:00 2001 From: Michiyo Wellington-Oguri Date: Sun, 30 Jul 2017 17:15:41 -0700 Subject: [PATCH] don't start new activity if already in that activity --- .../commons/theme/NavigationBaseActivity.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index af0d38243..6710b6367 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -77,19 +77,27 @@ public class NavigationBaseActivity extends BaseActivity switch (item.getItemId()) { case R.id.action_home: drawerLayout.closeDrawer(navigationView); - ContributionsActivity.startYourself(this); + if (!(this instanceof ContributionsActivity)) { + ContributionsActivity.startYourself(this); + } return true; case R.id.action_nearby: drawerLayout.closeDrawer(navigationView); - NearbyActivity.startYourself(this); + if (!(this instanceof NearbyActivity)) { + NearbyActivity.startYourself(this); + } return true; case R.id.action_about: drawerLayout.closeDrawer(navigationView); - AboutActivity.startYourself(this); + if (!(this instanceof AboutActivity)) { + AboutActivity.startYourself(this); + } return true; case R.id.action_settings: drawerLayout.closeDrawer(navigationView); - SettingsActivity.startYourself(this); + if (!(this instanceof SettingsActivity)) { + SettingsActivity.startYourself(this); + } return true; case R.id.action_introduction: drawerLayout.closeDrawer(navigationView);