From 5f840969a0b28958ad907ba658b41f2d4423ab4a Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 8 Sep 2017 10:05:43 +0200 Subject: [PATCH] Fix critical finish() bug --- .../com/rubenvandeven/emotionhero/GamingActivity.java | 4 +--- .../com/rubenvandeven/emotionhero/HighscoreActivity.java | 2 +- .../com/rubenvandeven/emotionhero/IntroActivity.java | 2 +- .../rubenvandeven/emotionhero/MirrorMenuActivity.java | 5 ++--- .../com/rubenvandeven/emotionhero/ProgressActivity.java | 2 +- .../com/rubenvandeven/emotionhero/ReviewActivity.java | 9 +++++---- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java index 965529c..54cf6c6 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java @@ -397,15 +397,13 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL // scores.add(score); player.savePlayerInfo(playerInfo); - - finish(); GameOpenHelper gameHelper = new GameOpenHelper(getApplicationContext()); gameHelper.insertGame(currentScenario.game); - Log.d(LOG_TAG, "WHYYYY won't it work?!!! ;-)"); Intent intent = new Intent(this, ReviewActivity.class); intent.putExtra(ReviewActivity.INTENT_EXTRA_GAME_ID, currentScenario.game.id); intent.putExtra(ReviewActivity.INTENT_EXTRA_FROM_GAME, true); startActivity(intent); + finish(); } } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java index 5820a01..fc6eb5c 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java @@ -329,8 +329,8 @@ public class HighscoreActivity extends AppCompatActivity { getContext().getResources().getString(R.string.load_game_activity), true); Intent intent = new Intent(getContext(), GamingActivity.class); intent.putExtra(GamingActivity.INTENT_EXTRA_SCENARIO, scenario.id); - getActivity().finish(); startActivity(intent); + getActivity().finish(); } }); } else { diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java index 1ede131..52ae936 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java @@ -90,9 +90,9 @@ public class IntroActivity extends AppCompatActivity { public void continueToMenu() { continueHandler.removeCallbacks(continueRunnable); Intent intent = new Intent(this, MirrorMenuActivity.class); - finish(); startActivity(intent); //disable distracting transition when going to menu IntroActivity.this.overridePendingTransition(0, 0); + finish(); } } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java index f0032bc..0729039 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java @@ -240,8 +240,9 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im @Override public void onClick(View v) { Intent intent = new Intent(MirrorMenuActivity.this, ProgressActivity.class); - finish(); startActivity(intent); + stopDetector(); + finish(); } }); @@ -249,8 +250,6 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im showSettings(); } - - // all setup, see wheter we immediately continue to intro: boolean showIntro = getIntent().getBooleanExtra(INTENT_EXTRA_SHOW_INTRO, false); if(showIntro) { diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java index cd172ec..f08a43f 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java @@ -204,8 +204,8 @@ public class ProgressActivity extends AppCompatActivity { @Override public void onClick(View v) { Intent intent = new Intent(getApplicationContext(), EndingActivity.class); - finish(); startActivity(intent); + finish(); } }); } diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java index f2add68..9104f0c 100644 --- a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java +++ b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java @@ -207,8 +207,9 @@ public class ReviewActivity extends AppCompatActivity { intent.putExtra(GamingActivity.INTENT_EXTRA_SCENARIO, game.scenario.id); ProgressDialog dialog = ProgressDialog.show(ReviewActivity.this, "", getApplicationContext().getResources().getString(R.string.load_game_activity), true); - finish(); + startActivity(intent); + finish(); } }); @@ -229,8 +230,8 @@ public class ReviewActivity extends AppCompatActivity { @Override public void onClick(View v) { Intent intent = new Intent(getApplicationContext(), EndingActivity.class); - finish(); startActivity(intent); + finish(); } }); } else { @@ -241,8 +242,8 @@ public class ReviewActivity extends AppCompatActivity { intent.putExtra(GamingActivity.INTENT_EXTRA_SCENARIO, game.scenario.getNextLevelId()); ProgressDialog dialog = ProgressDialog.show(ReviewActivity.this, "", getApplicationContext().getResources().getString(R.string.load_game_activity), true); - finish(); startActivity(intent); + finish(); } }); } @@ -343,8 +344,8 @@ public class ReviewActivity extends AppCompatActivity { if(fromGame) { Intent intent = new Intent(getApplicationContext(), HighscoreActivity.class); intent.putExtra(HighscoreActivity.INTENT_EXTRA_GAME_ID, game.id); - finish(); startActivity(intent); + finish(); } else { onBackPressed(); }