From c585ecd230c152529a683e78453faeb7235ea54d Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucas.lima@nubank.com.br>
Date: Tue, 30 Jun 2020 22:51:36 -0300
Subject: [PATCH] Fix mine count value on resume game

---
 .../dev/lucasnlm/antimine/GameActivity.kt     | 27 ++++++++++++-------
 .../common/level/viewmodel/GameViewModel.kt   |  1 +
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
index a35d3300..8aee98de 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
@@ -139,7 +139,7 @@ class GameActivity : AppCompatActivity(), DialogInterface.OnDismissListener {
                 val mines = area.filter { it.hasMine }
                 totalArea = area.count()
                 totalMines = mines.count()
-                rightMines = mines.map { if (it.mark.isFlag()) 1 else 0 }.sum()
+                rightMines = mines.count { it.mark.isFlag() }
             }
         )
 
@@ -166,13 +166,18 @@ class GameActivity : AppCompatActivity(), DialogInterface.OnDismissListener {
 
     override fun onResume() {
         super.onResume()
-        if (status == Status.Running) {
-            viewModel.refreshUserPreferences()
-            viewModel.resumeGame()
-            analyticsManager.sentEvent(Analytics.Resume())
-        }
+        val willReset = restartIfNeed()
 
-        restartIfNeed()
+        if (!willReset) {
+            if (status == Status.Running) {
+                viewModel.run {
+                    refreshUserPreferences()
+                    resumeGame()
+                }
+
+                analyticsManager.sentEvent(Analytics.Resume())
+            }
+        }
     }
 
     override fun onPause() {
@@ -536,9 +541,11 @@ class GameActivity : AppCompatActivity(), DialogInterface.OnDismissListener {
      * If user change any accessibility preference, the game will restart the activity to
      * apply these changes.
      */
-    private fun restartIfNeed() {
-        if (usingLargeArea != preferencesRepository.useLargeAreas()) {
-            recreate()
+    private fun restartIfNeed(): Boolean {
+        return (usingLargeArea != preferencesRepository.useLargeAreas()).also {
+            if (it) {
+                recreate()
+            }
         }
     }
 
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt
index ce850f7b..0911889d 100644
--- a/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt
+++ b/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt
@@ -94,6 +94,7 @@ class GameViewModel @ViewModelInject constructor(
         difficulty.postValue(save.difficulty)
         levelSetup.postValue(setup)
         refreshAll()
+        refreshMineCount()
 
         when {
             gameController.hasAnyMineExploded() -> eventObserver.postValue(Event.GameOver)