Updated resumeGame() logic for Rewarded Interstitial samples

PiperOrigin-RevId: 557569873
googleads · Aug 17, 2023 · b138412 · b138412
1 parent 26122a9
commit b138412
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/...ialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/MainActivity.java b/...ialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/MainActivity.java
@@ -152,17 +152,21 @@ public void onPause() {
   @Override
   public void onResume() {
     super.onResume();
-    if (!gameOver && gamePaused) {
-      resumeGame();
-    }
+    resumeGame();
   }
 
   private void pauseGame() {
+    if (gameOver || gamePaused) {
+      return;
+    }
     countDownTimer.cancel();
     gamePaused = true;
   }
 
   private void resumeGame() {
+    if (gameOver || !gamePaused) {
+      return;
+    }
     createTimer(timeRemaining);
     gamePaused = false;
   }

diff --git a/...ialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/MainActivity.java b/...ialExample/app/src/main/java/com/google/ads/rewardedinterstitialexample/MainActivity.java
@@ -152,17 +152,21 @@ public void onPause() {
   @Override
   public void onResume() {
     super.onResume();
-    if (!gameOver && gamePaused) {
-      resumeGame();
-    }
+    resumeGame();
   }
 
   private void pauseGame() {
+    if (gameOver || gamePaused) {
+      return;
+    }
     countDownTimer.cancel();
     gamePaused = true;
   }
 
   private void resumeGame() {
+    if (gameOver || !gamePaused) {
+      return;
+    }
     createTimer(timeRemaining);
     gamePaused = false;
   }

diff --git a/.../src/main/java/com/google/android/gms/example/rewardedinterstitialexample/MainActivity.kt b/.../src/main/java/com/google/android/gms/example/rewardedinterstitialexample/MainActivity.kt
@@ -95,9 +95,7 @@ class MainActivity : AppCompatActivity() {
 
   public override fun onResume() {
     super.onResume()
-    if (!gameOver && gamePaused) {
-      resumeGame()
-    }
+    resumeGame()
   }
 
   override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -133,11 +131,17 @@ class MainActivity : AppCompatActivity() {
   }
 
   private fun pauseGame() {
+    if (gameOver || gamePaused) {
+      return
+    }
     countDownTimer?.cancel()
     gamePaused = true
   }
 
   private fun resumeGame() {
+    if (gameOver || !gamePaused) {
+      return
+    }
     createTimer(timeRemaining)
     gamePaused = false
   }

diff --git a/.../src/main/java/com/google/android/gms/example/rewardedinterstitialexample/MainActivity.kt b/.../src/main/java/com/google/android/gms/example/rewardedinterstitialexample/MainActivity.kt
@@ -95,9 +95,7 @@ class MainActivity : AppCompatActivity() {
 
   public override fun onResume() {
     super.onResume()
-    if (!gameOver && gamePaused) {
-      resumeGame()
-    }
+    resumeGame()
   }
 
   override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -133,11 +131,17 @@ class MainActivity : AppCompatActivity() {
   }
 
   private fun pauseGame() {
+    if (gameOver || gamePaused) {
+      return
+    }
     countDownTimer?.cancel()
     gamePaused = true
   }
 
   private fun resumeGame() {
+    if (gameOver || !gamePaused) {
+      return
+    }
     createTimer(timeRemaining)
     gamePaused = false
   }