Improve "Opening Prime Number after Catalan Number"

- tranleduy2000#47
basile-laderchi · Jun 20, 2019 · 5dde5a1 · 5dde5a1
1 parent be828ce
commit 5dde5a1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/app/src/main/java/com/duy/calculator/activities/base/NavDrawerActivity.java b/app/src/main/java/com/duy/calculator/activities/base/NavDrawerActivity.java
@@ -258,37 +258,49 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 break;
             case R.id.nav_permutation:
                 intent = new Intent(getApplicationContext(), PermutationActivity.class);
-                finish();
+                if (this instanceof PermutationActivity) {
+                    finish();
+                }
                 intent.putExtra(PermutationActivity.TYPE_NUMBER, PermutationActivity.TYPE_PERMUTATION);
                 postStartActivity(intent);
                 break;
             case R.id.nav_combination:
                 intent = new Intent(getApplicationContext(), PermutationActivity.class);
-                finish();
+                if (this instanceof PermutationActivity) {
+                    finish();
+                }
                 intent.putExtra(PermutationActivity.TYPE_NUMBER, PermutationActivity.TYPE_COMBINATION);
                 postStartActivity(intent);
                 break;
             case R.id.nav_catalan:
                 intent = new Intent(getApplicationContext(), NumberActivity.class);
-                finish();
+                if (this instanceof NumberActivity) {
+                    finish();
+                }
                 intent.putExtra(NumberActivity.DATA, NumberActivity.NumberType.CATALAN);
                 postStartActivity(intent);
                 break;
             case R.id.nav_fibo:
                 intent = new Intent(getApplicationContext(), NumberActivity.class);
-                finish();
+                if (this instanceof NumberActivity) {
+                    finish();
+                }
                 intent.putExtra(NumberActivity.DATA, NumberActivity.NumberType.FIBONACCI);
                 postStartActivity(intent);
                 break;
             case R.id.nav_prime:
                 intent = new Intent(getApplicationContext(), NumberActivity.class);
-                finish();
+                if (this instanceof NumberActivity) {
+                    finish();
+                }
                 intent.putExtra(NumberActivity.DATA, NumberActivity.NumberType.PRIME);
                 postStartActivity(intent);
                 break;
             case R.id.action_divisors:
                 intent = new Intent(getApplicationContext(), NumberActivity.class);
-                finish();
+                if (this instanceof NumberActivity) {
+                    finish();
+                }
                 intent.putExtra(NumberActivity.DATA, NumberActivity.NumberType.DIVISORS);
                 postStartActivity(intent);
                 break;

diff --git a/app/src/main/java/com/duy/calculator/symja/activities/PermutationActivity.java b/app/src/main/java/com/duy/calculator/symja/activities/PermutationActivity.java
@@ -67,6 +67,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             finish();
             return;
         }
+        type = bundle;
 
         if (bundle == TYPE_PERMUTATION) {
             setTitle(R.string.permutation);