From 8d8d2fd01d00bde9927459a8b5801ff9eeba51cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <gaetan.schwartz@epfl.ch>
Date: Wed, 25 May 2022 19:13:21 +0200
Subject: [PATCH 01/12] done

---
 .idea/inspectionProfiles/Project_Default.xml  |  3 +-
 .../java/ch/epfl/sweng/rps/CacheTests.kt      | 81 +++++++--------
 .../ch/epfl/sweng/rps/LoadingActivityTest.kt  |  2 +-
 .../java/ch/epfl/sweng/rps/LoginPageTest.kt   |  8 +-
 .../ui/onboarding/OnBoardingActivityTest.kt   |  7 +-
 .../java/ch/epfl/sweng/rps/LoadingActivity.kt | 87 ++++++++--------
 .../java/ch/epfl/sweng/rps/LoginActivity.kt   | 50 +++++-----
 .../java/ch/epfl/sweng/rps/MainActivity.kt    | 20 ----
 .../sweng/rps/auth/FirebaseAuthenticator.kt   |  3 +-
 .../sweng/rps/models/xbstract/AbstractUser.kt | 12 +--
 .../rps/models/xbstract/ComputerPlayer.kt     |  8 +-
 .../ch/epfl/sweng/rps/persistence/Cache.kt    | 99 ++++++++++++-------
 .../sweng/rps/persistence/PrivateStorage.kt   | 34 ++-----
 .../ch/epfl/sweng/rps/persistence/Storage.kt  | 14 ++-
 .../epfl/sweng/rps/remote/FirebaseHelper.kt   | 13 +--
 .../sweng/rps/ui/game/MatchmakingFragment.kt  |  2 +-
 .../ui/leaderboard/LeaderBoardViewModel.kt    |  2 +-
 .../rps/ui/onboarding/OnBoardingActivity.kt   | 61 ++++++------
 .../sweng/rps/ui/profile/ProfileFragment.kt   | 49 +++++----
 .../sweng/rps/ui/profile/ProfileViewModel.kt  | 20 ++--
 .../sweng/rps/ui/settings/SettingsActivity.kt |  4 +-
 .../rps/ui/statistics/StatisticsViewModel.kt  |  2 +-
 .../main/java/ch/epfl/sweng/rps/utils/L.kt    |  4 +-
 app/src/main/res/layout/activity_login.xml    | 68 +++++++++----
 app/src/main/res/values/strings.xml           |  2 +
 25 files changed, 339 insertions(+), 316 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 78596612..43344c8a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,7 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
-    <inspection_tool class="KDocMissingDocumentation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="FoldInitializerAndIfToElvis" enabled="false" level="INFO" enabled_by_default="false" />
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="previewFile" value="true" />
     </inspection_tool>
@@ -20,7 +20,6 @@
     </inspection_tool>
     <inspection_tool class="PropertyName" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="ReplaceCollectionCountWithSize" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="ReplaceNotNullAssertionWithElvisReturn" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
index 4e556159..f3fcaa34 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
@@ -14,7 +14,6 @@ import ch.epfl.sweng.rps.persistence.Cache
 import ch.epfl.sweng.rps.persistence.PrivateStorage
 import ch.epfl.sweng.rps.persistence.Storage
 import ch.epfl.sweng.rps.remote.Env
-import ch.epfl.sweng.rps.remote.FirebaseRepository
 import ch.epfl.sweng.rps.services.ServiceLocator
 import com.google.firebase.ktx.Firebase
 import io.mockk.mockk
@@ -24,76 +23,78 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.*
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
 class CacheTests {
-    lateinit var cache: Cache
-    lateinit var cacheWithoutAuth: Cache
-    lateinit var storage: Storage
+    private lateinit var cache: Cache
+    private lateinit var cacheWithoutAuth: Cache
+    private lateinit var storage: Storage
 
     @Before
     fun setUp() {
         ServiceLocator.setCurrentEnv(Env.Prod)
         Firebase.initializeForTest()
-        cacheWithoutAuth = Cache.createInstance(
+        cacheWithoutAuth = Cache.initialize(
             InstrumentationRegistry.getInstrumentation().targetContext,
-            mockk<FirebaseRepository>(relaxed = true)
+            mockk(relaxed = true)
         )
-        cache = Cache.createInstance(InstrumentationRegistry.getInstrumentation().targetContext)
+        cache = Cache.initialize(InstrumentationRegistry.getInstrumentation().targetContext)
         storage = PrivateStorage(InstrumentationRegistry.getInstrumentation().targetContext)
-        storage.removeFile(Storage.FILES.STATSDATA)
-        storage.removeFile(Storage.FILES.USERINFO)
-        storage.removeFile(Storage.FILES.LEADERBOARDDATA)
-        storage.removeFile(Storage.FILES.USERPICTURE)
+        for (file in Storage.FILES.values()) {
+            storage.deleteFile(file)
+        }
     }
 
     @After
     fun tearDown() {
-        storage.removeFile(Storage.FILES.STATSDATA)
-        storage.removeFile(Storage.FILES.USERINFO)
-        storage.removeFile(Storage.FILES.LEADERBOARDDATA)
-        storage.removeFile(Storage.FILES.USERPICTURE)
+        for (file in Storage.FILES.values()) {
+            storage.deleteFile(file)
+        }
     }
 
     @Test
     fun cacheContainsNoDataWhenCreated() {
-        assert(cache.getUserDetails() == null)
-        assert(cache.getStatsData(0).isEmpty())
-        assert(cache.getLeaderBoardData(0).isEmpty())
+        assertNull(cache.getUserDetailsFromCache())
+        assertTrue(cache.getStatsDataFromCache(0).isEmpty())
+        assertTrue(cache.getLeaderBoardDataFromCache(0).isEmpty())
     }
 
     @Test
     fun cacheCorrectlyRetrievesUserDetailsFromStorage() {
         runBlocking {
-            assert(cacheWithoutAuth.getUserDetails() == null)
+            assertNull(cacheWithoutAuth.getUserDetailsFromCache())
             cacheWithoutAuth.updateUserDetails(User(uid = "RAND"))
-            assert(cacheWithoutAuth.getUserDetails()?.uid == "RAND")
+            assertEquals(cacheWithoutAuth.getUserDetailsFromCache()?.uid, "RAND")
         }
     }
 
     @Test
     fun cacheCorrectlySavesUser() {
-        val user: User? = User(username = "USERNAME", uid = "01234", email = "test@test.org")
-        cache.updateUserDetails(user)
-        assert(cache.getUserDetails()!! == user)
+        val user = User(username = "USERNAME", uid = "01234", email = "test@test.org")
+        cache.setUserDetails(user)
+        assertEquals(cache.getUserDetailsFromCache()!!, user)
     }
 
     @Test
     fun cacheCorrectlySavesStatsData() {
-        assert(cache.getStatsData(0).isEmpty())
-        val lst = listOf<UserStat>(
+        assertTrue(cache.getStatsDataFromCache(0).isEmpty())
+        val lst = listOf(
             UserStat(gameId = "1234", date = "14/07/2020", opponents = "Opp", "Best 5", "0"),
             UserStat(gameId = "1244", date = "14/07/1020", opponents = "Opp1", "Best 3", "0"),
             UserStat(gameId = "12134", date = "14/07/3020", opponents = "Opp2", "Best 1", "0"),
         )
         cache.updateStatsData(lst)
-        val result = cache.getStatsData(0)
-        assert(result == lst)
+        val result = cache.getStatsDataFromCache(0)
+        assertEquals(result, lst)
     }
 
     @Test
     fun cacheCorrectlySavesLeaderBoardData() {
-        assert(cache.getLeaderBoardData(0).isEmpty())
+        assertTrue(cache.getLeaderBoardDataFromCache(0).isEmpty())
         val user1 =
             LeaderBoardInfo("jinglun", "1", null, 100)
         val user2 =
@@ -102,41 +103,41 @@ class CacheTests {
             LeaderBoardInfo("Adam", "3", null, 60)
         val allPlayers = listOf(user1, user2, user3)
         cache.updateLeaderBoardData(allPlayers)
-        val result = cache.getLeaderBoardData(0)
-        assert(result == allPlayers)
+        val result = cache.getLeaderBoardDataFromCache(0)
+        assertEquals(result, allPlayers)
     }
 
     @Test
     fun cacheCorrectlySavesProfileImage() {
-        assert(cacheWithoutAuth.getUserPicture() == null)
-        val btm = createTestBitmap(30, 30, null)
         runBlocking {
+            assertNull(cacheWithoutAuth.getUserPicture())
+            val btm = createTestBitmap(30, 30, null)
             cacheWithoutAuth.updateUserPicture(btm)
+            assertEquals(cacheWithoutAuth.getUserPicture(), btm)
         }
-        assert(cacheWithoutAuth.getUserPicture() == btm)
     }
 
     @Test
     fun cacheCorrectlyRetrievesProfileImageFromStorage() {
-        assert(cache.getUserPicture() == null)
+        assertNull(cache.getUserPicture())
         val bitmap = createTestBitmap(20, 20, Color.RED)
         storage.writeBackUserPicture(bitmap)
-        assert(cache.getUserPicture() != null)
+        assertNotNull(cache.getUserPicture())
     }
 
-    fun createTestBitmap(w: Int, h: Int, @ColorInt color: Int?): Bitmap {
-        var color = color
+    private fun createTestBitmap(w: Int, h: Int, @ColorInt color: Int?): Bitmap {
+        var c = color
         val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
-        if (color == null) {
+        if (c == null) {
             val colors = intArrayOf(
                 Color.BLUE, Color.GREEN, Color.RED,
                 Color.YELLOW, Color.WHITE
             )
             val rgen = Random()
-            color = colors[rgen.nextInt(colors.size - 1)]
+            c = colors[rgen.nextInt(colors.size - 1)]
         }
-        canvas.drawColor(color)
+        canvas.drawColor(c)
         return bitmap
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
index bd52f43e..0a35eed3 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
@@ -21,7 +21,7 @@ class LoadingActivityTest {
     }
 
     @get:Rule
-    val rule = ActivityScenarioRuleWithSetup.default<LoginActivity>(createIntent())
+    val rule = ActivityScenarioRuleWithSetup.default<LoadingActivity>(createIntent())
 
     @Test
     fun start() {
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/LoginPageTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/LoginPageTest.kt
index 226bdefb..bceb4bb4 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/LoginPageTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/LoginPageTest.kt
@@ -24,18 +24,18 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class LoginPageTest {
-    lateinit var scenario: ActivityScenario<LoginActivity>
+    private lateinit var scenario: ActivityScenario<LoginActivity>
 
     @Before
     fun setUp() {
         Firebase.initializeForTest()
         FirebaseAuth.getInstance().signOut()
-        PrivateStorage(InstrumentationRegistry.getInstrumentation().targetContext).removeFile(
+        PrivateStorage(InstrumentationRegistry.getInstrumentation().targetContext).deleteFile(
             Storage.FILES.USERINFO
         )
         Intents.init()
-        Cache.createInstance(InstrumentationRegistry.getInstrumentation().targetContext)
-            .updateUserDetails(null)
+        Cache.initialize(InstrumentationRegistry.getInstrumentation().targetContext)
+            .setUserDetails(null)
         scenario = ActivityScenario.launch(LoginActivity::class.java)
     }
 
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivityTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivityTest.kt
index 047d3573..7b9edb06 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivityTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivityTest.kt
@@ -20,7 +20,10 @@ class OnBoardingActivityTest {
             InstrumentationRegistry.getInstrumentation().targetContext,
             OnBoardingActivity::class.java
         )
-        intent.putExtra(OnBoardingActivity.DESTINATION_EXTRA, OnBoardingActivity.Destination.FINISH)
+        intent.putExtra(
+            OnBoardingActivity.AFTER_ONBOARDING_DONE_EXTRA,
+            OnBoardingActivity.AfterOnboardingAction.FINISH
+        )
         return intent
     }
 
@@ -29,7 +32,7 @@ class OnBoardingActivityTest {
         val scenario = ActivityScenario.launch<OnBoardingActivity>(createIntent())
         onView(withId(R.id.onboarding_layout)).check(matches(isDisplayed()))
         val activity = TestUtils.getActivityInstance<OnBoardingActivity>()
-        OnBoardingActivity.navOut(activity)
+        activity.navOut()
         TestUtils.retryPredicate(retryDelay = 200, maxRetries = 10) {
             scenario.state == Lifecycle.State.DESTROYED
         }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
index 0b522118..95e88aa4 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
@@ -1,13 +1,14 @@
 package ch.epfl.sweng.rps
 
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
-import android.util.Log
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import ch.epfl.sweng.rps.persistence.Cache
+import ch.epfl.sweng.rps.services.ServiceLocator
 import ch.epfl.sweng.rps.ui.onboarding.OnBoardingActivity
 import ch.epfl.sweng.rps.utils.FirebaseEmulatorsUtils
+import ch.epfl.sweng.rps.utils.L
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.ktx.initialize
 import kotlinx.coroutines.delay
@@ -24,15 +25,12 @@ class LoadingActivity : AppCompatActivity() {
      * Here logic to setup the app
      */
     private suspend fun logic() {
-        Log.w("LoadingPage", "logic")
+        log.log("logic")
 
         Firebase.initialize(this@LoadingActivity)
+        Cache.initialize(this@LoadingActivity)
         useEmulatorsIfNeeded()
         delay(1000)
-        if (!isTest) {
-            openLogin()
-            finish()
-        }
     }
 
     private fun openLogin() {
@@ -42,13 +40,13 @@ class LoadingActivity : AppCompatActivity() {
 
     private fun useEmulatorsIfNeeded() {
         val use = intent.getStringExtra("USE_EMULATORS")
-        Log.d("MainActivity", "USE_EMULATORS: $use")
+        log.log("USE_EMULATORS: $use")
         if (use == "true") {
             if (isTest) {
                 throw IllegalStateException("Emulators should not be used in tests")
             }
             FirebaseEmulatorsUtils.useEmulators()
-            Log.w("MainActivity", "Using emulators")
+            log.w("Using emulators")
         }
     }
 
@@ -57,10 +55,8 @@ class LoadingActivity : AppCompatActivity() {
 
     private fun setupApp() {
         // All the logic here is to check if the user is logged in or not
-        if (!hasRunLogic) {
-            runBlocking { logic() }
-            hasRunLogic = true
-        }
+
+        runBlocking { logic() }
 
         if (!isTest) {
             nav()
@@ -68,52 +64,47 @@ class LoadingActivity : AppCompatActivity() {
     }
 
 
+    val log = L.of(this)
+
+
     private fun nav() {
-        Log.w("LoadingPage", "nav")
-        val doneOnBoarding =
-            intent.extras?.getBoolean(OnBoardingActivity.DONE_ONBOARDING_EXTRA, false) ?: false
-        if (OnBoardingActivity.isFirstTime(this) && !doneOnBoarding) {
-            Log.w("LoadingPage", "nav to onboarding")
-            OnBoardingActivity.launch(this, OnBoardingActivity.Destination.FINISH)
-        } else {
-            Log.w("LoadingPage", "nav to main")
+        log.log("nav")
+
+        if (!hasAlreadyOnboarded && OnBoardingActivity.isFirstTime(this)) {
+            log.log("nav to onboarding")
+            OnBoardingActivity.launch(this)
+            return
+        }
+        val isLoggedIn = ServiceLocator.getInstance().repository.rawCurrentUid() != null
+        log.log("isLoggedIn: $isLoggedIn")
+        if (!isLoggedIn) {
+            log.log("nav to login")
             startActivity(Intent(this, LoginActivity::class.java))
+            finish()
+            return
         }
+        log.log("nav to main")
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
     }
 
+    private var hasAlreadyOnboarded = false
 
-    override fun onResume() {
-        super.onResume()
+    override fun onStart() {
+        super.onStart()
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == OnBoardingActivity.RESULT_ONBOARDING_FINISHED) {
+                log.log("Onboarding finished")
+                hasAlreadyOnboarded = true
+                nav()
+            }
+        }
         setupApp()
     }
 
 
     companion object {
-        private const val HELP_ME_NAV_EXTRA = "helpMeNav"
         const val IS_TEST_EXTRA = "isTest"
 
-        private var hasRunLogic = false
-
-        fun launch(context: Context, helpMeNav: Boolean, vararg extras: Pair<String, Any>) {
-            val intent = Intent(context, LoadingActivity::class.java)
-            intent.putExtra(HELP_ME_NAV_EXTRA, helpMeNav)
-            extras.forEach { intent.putExtra(it.first, it.second) }
-            context.startActivity(intent)
-        }
-
-        private fun Intent.putExtra(key: String, value: Any) {
-            when (value) {
-                is String -> putExtra(key, value)
-                is Int -> putExtra(key, value)
-                is Boolean -> putExtra(key, value)
-                is Bundle -> putExtra(key, value)
-                is Array<*> -> putExtra(key, value)
-                is Parcelable -> putExtra(key, value)
-                is Double -> putExtra(key, value)
-                is Float -> putExtra(key, value)
-                is Long -> putExtra(key, value)
-                else -> throw IllegalArgumentException("Type of ${value.javaClass.name} is not supported")
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/LoginActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/LoginActivity.kt
index 56ac70d2..9ce7c94c 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/LoginActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/LoginActivity.kt
@@ -2,8 +2,9 @@ package ch.epfl.sweng.rps
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.View
+import android.widget.Button
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.epfl.sweng.rps.auth.FirebaseAuthenticator
 import ch.epfl.sweng.rps.models.remote.User
@@ -11,42 +12,39 @@ import ch.epfl.sweng.rps.persistence.Cache
 
 class LoginActivity : AppCompatActivity() {
 
-    private var callback =
-        { user: User? ->
-            cache.updateUserDetails(user)
-            if (user != null) launchMain(user)
-        }
+    private lateinit var cache: Cache
+
+    private val callback = { user: User ->
+        cache.setUserDetails(user)
+        setLoading(false)
+        launchMain()
+    }
+
+    private val authenticator: FirebaseAuthenticator =
+        FirebaseAuthenticator.registerFor(this, callback)
 
-    private fun launchMain(user: User) {
+    private fun launchMain() {
         val intent = Intent(this, MainActivity::class.java)
-        val b = Bundle()
-        b.putString("email", user.email)
-        b.putString("display_name", user.username)
-        b.putString("uid", user.uid)
-        b.putString("privacy", user.games_history_privacy)
-        intent.putExtra("User", b)
         startActivity(intent)
         finish() // removes the activity from the Activity stack and prevents main from being launched twice
     }
 
-    private var authenticator: FirebaseAuthenticator =
-        FirebaseAuthenticator.registerFor(this, callback)
-    private lateinit var cache: Cache
-    private var user: User? = null
+    private fun setLoading(isLoading: Boolean) {
+        findViewById<View>(R.id.loading_layout_login).visibility =
+            if (isLoading) View.VISIBLE else View.GONE
+        findViewById<TextView>(R.id.not_signed_in_textview).visibility =
+            if (isLoading) View.GONE else View.VISIBLE
+    }
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
-        cache = Cache.getInstance() ?: Cache.createInstance(this)
-        user = cache.getUserDetails()
-        if (user != null) {
-            Log.d("CACHE", "LAUNCHING MAIN")
-            launchMain(user!!)
+        findViewById<Button>(R.id.signIn).setOnClickListener {
+            setLoading(true)
+            authenticator.signInWithGoogle()
         }
-    }
-
-    fun signIn(view: View) {
-        authenticator.signInWithGoogle()
+        cache = Cache.getInstance()
     }
 }
 
diff --git a/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
index 0248872e..b8bbad95 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
@@ -6,8 +6,6 @@ import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
 import ch.epfl.sweng.rps.databinding.ActivityMainBinding
-import ch.epfl.sweng.rps.models.remote.User
-import ch.epfl.sweng.rps.persistence.Cache
 import ch.epfl.sweng.rps.ui.settings.SettingsActivity
 import com.google.android.material.bottomnavigation.BottomNavigationView
 
@@ -18,23 +16,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     private lateinit var binding: ActivityMainBinding
-    private lateinit var currentUser: User
-    private lateinit var cache: Cache
 
     override fun onCreate(savedInstanceState: Bundle?) {
         SettingsActivity.applyTheme(getString(R.string.theme_pref_key), sharedPreferences)
         super.onCreate(savedInstanceState)
-        cache = Cache.getInstance() ?: Cache.createInstance(this)
-        val userData: Bundle? = intent.extras?.getBundle("User")
-        if (userData != null) {
-            currentUser = User(
-                userData.getString("display_name"),
-                userData.getString("uid")!!,
-                userData.getString("privacy")!!,
-                false,
-                userData.getString("email")
-            )
-        }
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -47,11 +32,6 @@ class MainActivity : AppCompatActivity() {
 
     }
 
-
-    fun getUserDetails(): User {
-        return currentUser
-    }
-
     /*  private fun setupNav() {
           val navController = findNavController(R.id.nav_host_fragment_activity_main)
           val navView: BottomNavigationView = binding.navView
diff --git a/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt b/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt
index d1c3cee7..0471e45a 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt
@@ -37,9 +37,8 @@ class FirebaseAuthenticator private constructor(
         val credential = GoogleAuthProvider.getCredential(idToken, null)
         FirebaseAuth.getInstance().signInWithCredential(credential).addOnCompleteListener { res ->
             val user = res.result.user!!
-            var userData: User
             runBlocking {
-                userData = createOrGetUser(user.uid, user.displayName, user.email)
+                val userData = createOrGetUser(user.uid, user.displayName, user.email)
                 callback(userData)
             }
         }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/AbstractUser.kt b/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/AbstractUser.kt
index 0eba9753..cfe9340c 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/AbstractUser.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/AbstractUser.kt
@@ -2,11 +2,11 @@ package ch.epfl.sweng.rps.models.xbstract
 
 import ch.epfl.sweng.rps.models.remote.User
 
-abstract class AbstractUser(
-    open val username: String? = "",
-    open val uid: String = "",
-    open val games_history_privacy: String = "",
-    open val has_profile_photo: Boolean = false,
-) {
+abstract class AbstractUser {
+    abstract val username: String?
+    abstract val uid: String
+    abstract val games_history_privacy: String
+    abstract val has_profile_photo: Boolean
+
     fun gamesHistoryPrivacyEnum(): User.Privacy = User.Privacy.valueOf(games_history_privacy)
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/ComputerPlayer.kt b/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/ComputerPlayer.kt
index 7f99a90a..6bdb60e3 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/ComputerPlayer.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/models/xbstract/ComputerPlayer.kt
@@ -3,11 +3,11 @@ package ch.epfl.sweng.rps.models.xbstract
 import ch.epfl.sweng.rps.models.remote.Hand
 
 abstract class ComputerPlayer(
-    username: String? = "",
+    override val username: String? = "",
     override val uid: String,
-    games_history_privacy: String = "",
-    has_profile_photo: Boolean = false,
-) : AbstractUser(username, uid, games_history_privacy, has_profile_photo) {
+    override val games_history_privacy: String = "",
+    override val has_profile_photo: Boolean = false,
+) : AbstractUser() {
     /**
      * @return one of the possible moves (represented by a class e.g. Hand)
      */
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
index 4c3a3e30..b89a26cd 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
@@ -3,63 +3,74 @@ package ch.epfl.sweng.rps.persistence
 import android.content.Context
 import android.graphics.Bitmap
 import android.util.Log
+import androidx.annotation.VisibleForTesting
 import ch.epfl.sweng.rps.models.remote.LeaderBoardInfo
 import ch.epfl.sweng.rps.models.remote.User
 import ch.epfl.sweng.rps.models.ui.UserStat
 import ch.epfl.sweng.rps.remote.FirebaseHelper
 import ch.epfl.sweng.rps.remote.FirebaseRepository
+import ch.epfl.sweng.rps.remote.Repository
 import ch.epfl.sweng.rps.services.ServiceLocator
 import java.net.InetAddress
 
 
 class Cache private constructor(ctx: Context, val preferFresh: Boolean = false) {
-
-
-    private var fbRepo = ServiceLocator.getInstance().repository
     private val storage: Storage = PrivateStorage(ctx)
+
     private var user: User? = null
     private var userPicture: Bitmap? = null
     private lateinit var userStatData: List<UserStat>
     private lateinit var leaderBoardData: List<LeaderBoardInfo>
-    fun getUserDetails(): User? {
+
+    private val repo get() = repoOverride ?: ServiceLocator.getInstance().repository
+    private var repoOverride: Repository? = null
+
+
+    fun getUserDetailsFromCache(): User? {
         if (user != null) return user
-        user = storage.getUserDetails()
+        user = storage.getUser()
         return user
     }
 
-    suspend fun getUserDetailsAsync(callback: (User?) -> Unit) {
-        if (!isInternetAvailable())
-            return
-        val uid = fbRepo.getCurrentUid()
-        user = fbRepo.getUser(uid)
-        callback(user)
+    suspend fun getUserDetails(): User? {
+        val uid = repo.rawCurrentUid()
+
+        if (uid == null) return getUserDetailsFromCache()
+
+        if (user != null && user!!.uid == uid) return user
+        repo.getUser(uid)?.apply {
+            user = this
+            storage.writeBackUser(this)
+            return this
+        }
+        return user
     }
 
     suspend fun updateUserDetails(user: User, vararg pairs: Pair<User.Field, Any>) {
         this.user = user
         storage.writeBackUser(user)
-        fbRepo.updateUser(*pairs)
+        repo.updateUser(*pairs)
     }
 
-    fun updateStatsData(statsData: List<UserStat>) {
-        userStatData = statsData
-        storage.writeBackStatsData(statsData)
-    }
-
-    fun updateUserDetails(user: User?) {
+    fun setUserDetails(user: User?) {
         if (user == null) {
             this.user = null
-            storage.removeFile(Storage.FILES.USERINFO)
+            storage.deleteFile(Storage.FILES.USERINFO)
             return
         }
         this.user = user
         storage.writeBackUser(user)
     }
 
+
+    fun updateStatsData(statsData: List<UserStat>) {
+        userStatData = statsData
+        storage.writeBackStatsData(statsData)
+    }
+
+
     fun getUserPicture(): Bitmap? {
-        if (userPicture != null)
-            return userPicture
-        return storage.getUserPicture()
+        return userPicture ?: storage.getUserPicture()
     }
 
     suspend fun getUserPictureAsync(): Bitmap? {
@@ -68,7 +79,7 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         }
         if (user == null)
             return null
-        userPicture = fbRepo.getUserProfilePictureImage(user!!.uid)
+        userPicture = repo.getUserProfilePictureImage(user!!.uid)
         Log.d("UserPic", userPicture.toString())
         userPicture?.let { storage.writeBackUserPicture(it) }
         return userPicture
@@ -76,20 +87,20 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
 
     suspend fun updateUserPicture(bitmap: Bitmap) {
         userPicture = bitmap
-        fbRepo.setUserProfilePicture(bitmap)
+        repo.setUserProfilePicture(bitmap)
         storage.writeBackUserPicture(bitmap)
     }
 
-    fun getStatsData(position: Int): List<UserStat> {
+    fun getStatsDataFromCache(position: Int): List<UserStat> {
         if (::userStatData.isInitialized) return userStatData
         userStatData = storage.getStatsData() ?: listOf()
         return userStatData
     }
 
-    suspend fun getStatsDataAsync(position: Int): List<UserStat> {
+    suspend fun getStatsData(position: Int): List<UserStat> {
         if (!isInternetAvailable()) {
             Log.d("CACHE", "INTERNET NOT AVAILABLE")
-            return getStatsData(position)
+            return getStatsDataFromCache(position)
         }
         userStatData = FirebaseHelper.getStatsData(position)
         Log.d("Cache", userStatData.size.toString())
@@ -102,16 +113,16 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         storage.writeBackLeaderBoardData(lBData)
     }
 
-    fun getLeaderBoardData(position: Int): List<LeaderBoardInfo> {
+    fun getLeaderBoardDataFromCache(position: Int): List<LeaderBoardInfo> {
         if (::leaderBoardData.isInitialized) return leaderBoardData
         leaderBoardData = storage.getLeaderBoardData() ?: listOf()
         return leaderBoardData
     }
 
-    suspend fun getLeaderBoardDataAsync(position: Int): List<LeaderBoardInfo> {
+    suspend fun getLeaderBoardData(position: Int): List<LeaderBoardInfo> {
         if (!isInternetAvailable()) {
             Log.d("CACHE", "INTERNET NOT AVAILABLE")
-            return getLeaderBoardData(position)
+            return getLeaderBoardDataFromCache(position)
         }
         leaderBoardData = FirebaseHelper.getLeaderBoard(position)
         Log.d("Cache", leaderBoardData.size.toString())
@@ -119,8 +130,13 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return leaderBoardData
     }
 
+    private var lastResult = Pair(0L, false)
+
     private fun isInternetAvailable(): Boolean {
-        return try {
+        val now = System.currentTimeMillis()
+        if (now - lastResult.first < 1000 && lastResult.second)
+            return true
+        val res = try {
             val ipAddr: InetAddress = InetAddress.getByName("www.google.com")
             //You can replace it with your name
             !ipAddr.equals("")
@@ -128,23 +144,30 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
             Log.d("Cache", e.toString())
             false
         }
+        lastResult = Pair(now, res)
+        return res
     }
 
     companion object {
-        var cache: Cache? = null
-        fun getInstance(): Cache? {
+        lateinit var cache: Cache
+
+        fun getInstance(): Cache {
+            if (!::cache.isInitialized) {
+                throw IllegalStateException("Cache not initialized")
+            }
             return cache
         }
 
-        fun createInstance(ctx: Context): Cache {
+        fun initialize(ctx: Context): Cache {
             cache = Cache(ctx.applicationContext, true)
-            return cache!!
+            return cache
         }
 
-        fun createInstance(ctx: Context, repository: FirebaseRepository): Cache {
+        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+        fun initialize(ctx: Context, repository: FirebaseRepository): Cache {
             cache = Cache(ctx.applicationContext)
-            cache!!.fbRepo = repository
-            return cache!!
+            cache.repoOverride = repository
+            return cache
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt
index 25e552ac..f67e50c2 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt
@@ -13,39 +13,27 @@ import java.io.FileOutputStream
 import java.util.*
 
 class PrivateStorage constructor(val context: Context) : Storage {
-    val user: User? = null
-    val matches = null
+    private val gson = Gson()
+
     override fun getFile(file: Storage.FILES): File {
         return File(context.filesDir, file.file)
     }
 
-    override fun removeFile(file: Storage.FILES): Boolean {
-        return File(context.filesDir, file.file).delete()
+    override fun deleteFile(file: Storage.FILES): Boolean {
+        return getFile(file).delete()
     }
 
-    override fun getUserDetails(): User? {
+    override fun getUser(): User? {
         val userFile = getFile(Storage.FILES.USERINFO)
         if (!userFile.exists())
             return null
-        val values = HashMap<String, String>()
-        val properties = Properties()
-        properties.load(userFile.bufferedReader())
-        for (key in properties.stringPropertyNames()) {
-            values[key] = properties[key].toString()
-        }
-        return User(
-            values["username"].toString(), values["uid"].toString(),
-            "", false, values["email"]
-        )
+        val json = userFile.readText()
+        return gson.fromJson(json, User::class.java)
     }
 
     override fun writeBackUser(user: User) {
-        val data = Properties()
-        if (user.username != null) data["username"] = user.username
-        data["uid"] = user.uid
-        if (user.email != null) data["email"] = user.email
         val f = getFile(Storage.FILES.USERINFO)
-        data.store(f.bufferedWriter(), null)
+        f.writeText(gson.toJson(user))
     }
 
     override fun getStatsData(): List<UserStat>? {
@@ -53,7 +41,7 @@ class PrivateStorage constructor(val context: Context) : Storage {
         if (!statsFile.exists())
             return null
         val json = statsFile.readText()
-        val arr = Gson().fromJson(json, Array<UserStat>::class.java)
+        val arr = gson.fromJson(json, Array<UserStat>::class.java)
         return arr.toList()
     }
 
@@ -62,19 +50,17 @@ class PrivateStorage constructor(val context: Context) : Storage {
         if (!leaderBoardFile.exists())
             return null
         val json = leaderBoardFile.readText()
-        val arr = Gson().fromJson(json, Array<LeaderBoardInfo>::class.java)
+        val arr = gson.fromJson(json, Array<LeaderBoardInfo>::class.java)
         return arr.toList()
     }
 
     override fun writeBackStatsData(data: List<UserStat>) {
-        val gson = Gson()
         val json = gson.toJson(data.toTypedArray(), Array<UserStat>::class.java)
         val f = getFile(Storage.FILES.STATSDATA)
         f.writeText(json)
     }
 
     override fun writeBackLeaderBoardData(data: List<LeaderBoardInfo>) {
-        val gson = Gson()
         val json = gson.toJson(data.toTypedArray(), Array<LeaderBoardInfo>::class.java)
         val f = getFile(Storage.FILES.LEADERBOARDDATA)
         f.writeText(json)
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/Storage.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/Storage.kt
index 8869fea2..70912a10 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/Storage.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/Storage.kt
@@ -8,8 +8,8 @@ import java.io.File
 
 interface Storage {
     fun getFile(file: FILES): File
-    fun removeFile(file: FILES): Boolean
-    fun getUserDetails(): User?
+    fun deleteFile(file: FILES): Boolean
+    fun getUser(): User?
     fun getStatsData(): List<UserStat>?
     fun getLeaderBoardData(): List<LeaderBoardInfo>?
     fun writeBackUser(user: User)
@@ -23,4 +23,14 @@ interface Storage {
         USERPICTURE("USERPICTURE"),
         STATSDATA("STATSDATA")
     }
+
+    enum class Origin {
+        Cache,
+        Remote
+    }
+
+    sealed class CacheResult<T> {
+        data class Success<T>(val data: T, val origin: Origin) : CacheResult<T>()
+        data class Failure<T>(val error: Throwable) : CacheResult<T>()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/remote/FirebaseHelper.kt b/app/src/main/java/ch/epfl/sweng/rps/remote/FirebaseHelper.kt
index 151e2914..8e6a441e 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/remote/FirebaseHelper.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/remote/FirebaseHelper.kt
@@ -43,20 +43,21 @@ object FirebaseHelper {
             val gameModeName: String
             val gameModeID: Int
             val date = dateFormat.format(userGame.timestamp.toDate())
-            val allRoundScores = gameRounds.map { it.value.computeScores() }
-            val userScore = allRoundScores.asSequence().map { scores ->
+            val allRoundScores =
+                gameRounds.map { it.value.computeScores() }.filter { it.isNotEmpty() }
+            val userScore = allRoundScores.sumOf { scores ->
                 val max = scores.maxOf { it.points }
                 if (scores.any { it.points == max && it.uid == userid && !scores.all { score -> score.points == max } })
-                    1
+                    1L
                 else
-                    0
+                    0L
 
-            }.sum()
+            }
             val opponentScore = roundMode.minus(userScore)
             val score = userScore - opponentScore
             val outcome: Int = when {
                 score < 0 -> -1
-                score == 0 -> 0
+                score == 0L -> 0
                 else -> 1
             }
 
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/game/MatchmakingFragment.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/game/MatchmakingFragment.kt
index 739b8f64..af34db4c 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/game/MatchmakingFragment.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/game/MatchmakingFragment.kt
@@ -54,7 +54,7 @@ class MatchmakingFragment : Fragment() {
     }
 
     private fun write(text: String, level: L.Level = L.Level.WARN) {
-        L.of<MatchmakingFragment>().log(text, level = level)
+        L.of(this).log(text, level = level)
         binding.matchmakingStatusTextview.text = text
     }
 
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/leaderboard/LeaderBoardViewModel.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/leaderboard/LeaderBoardViewModel.kt
index 51ad161f..a50aee5a 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/leaderboard/LeaderBoardViewModel.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/leaderboard/LeaderBoardViewModel.kt
@@ -14,7 +14,7 @@ class LeaderBoardViewModel : ViewModel() {
     fun getLeaderBoard(position: Int): LiveData<List<LeaderBoardInfo>> {
         val livedata = MutableLiveData<List<LeaderBoardInfo>>()
         viewModelScope.launch(Dispatchers.IO) {
-            livedata.postValue(cache.getLeaderBoardDataAsync(position))
+            livedata.postValue(cache.getLeaderBoardData(position))
         }
         return livedata
     }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt
index 67011a72..a19a9dc0 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt
@@ -1,5 +1,6 @@
 package ch.epfl.sweng.rps.ui.onboarding
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
@@ -31,42 +32,20 @@ class OnBoardingActivity : AppCompatActivity() {
             ).apply()
         }
 
-
-        private fun newIntent(context: Context): Intent {
-            return Intent(context, OnBoardingActivity::class.java)
-        }
-
-        fun launch(context: Context, destination: Destination) {
-            val intent = newIntent(context)
-            intent.putExtra(
-                DESTINATION_EXTRA,
-                destination
-            )
-            context.startActivity(intent)
-        }
-
-
-        const val DESTINATION_EXTRA = "destination"
-        const val DONE_ONBOARDING_EXTRA = "done_onboarding"
-
-        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-        fun navOut(onBoardingActivity: OnBoardingActivity, onDestroy: (() -> Unit)? = null) {
-            setFirstTime(onBoardingActivity, false)
-            val destination =
-                onBoardingActivity.intent.getSerializableExtra(DESTINATION_EXTRA) as Destination
-            Log.i("OnBoardingActivity", "onboarding finished")
-            Log.i("OnBoardingActivity", "destination: $destination")
-            when (destination) {
-                Destination.FINISH -> {
-                    onBoardingActivity.finish()
-                }
-            }
+        fun launch(
+            context: Activity,
+            onDone: AfterOnboardingAction = AfterOnboardingAction.FINISH
+        ) {
+            val intent = Intent(context, OnBoardingActivity::class.java)
+            intent.putExtra(AFTER_ONBOARDING_DONE_EXTRA, onDone)
+            context.startActivityForResult(intent, 0)
         }
 
-
+        const val RESULT_ONBOARDING_FINISHED = 0x42069
+        const val AFTER_ONBOARDING_DONE_EXTRA = "after_onboarding_done"
     }
 
-    enum class Destination {
+    enum class AfterOnboardingAction {
         FINISH,
     }
 
@@ -80,7 +59,7 @@ class OnBoardingActivity : AppCompatActivity() {
         // new instance is created and data is took from an
         // array list known as getDataonborading
         val paperOnboardingFragment = PaperOnboardingFragment.newInstance(getDataforOnboarding())
-        paperOnboardingFragment.setOnRightOutListener { navOut(this) }
+        paperOnboardingFragment.setOnRightOutListener { navOut() }
         val fragmentTransaction = fragmentManager.beginTransaction()
 
         // fragmentTransaction method is used
@@ -92,6 +71,7 @@ class OnBoardingActivity : AppCompatActivity() {
         fragmentTransaction.commit()
     }
 
+
     private fun getDataforOnboarding(): ArrayList<PaperOnboardingPage> {
 
         // the first string is to show the main title ,
@@ -127,4 +107,19 @@ class OnBoardingActivity : AppCompatActivity() {
             source2
         ).toCollection(ArrayList())
     }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun navOut() {
+        setFirstTime(this, false)
+        val destination =
+            intent.getSerializableExtra(AFTER_ONBOARDING_DONE_EXTRA) as AfterOnboardingAction
+        Log.i("OnBoardingActivity", "onboarding finished")
+        Log.i("OnBoardingActivity", "destination: $destination")
+        when (destination) {
+            AfterOnboardingAction.FINISH -> {
+                setResult(RESULT_ONBOARDING_FINISHED)
+                finish()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileFragment.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileFragment.kt
index cd6c2c7f..cf369669 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileFragment.kt
@@ -18,26 +18,47 @@ import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import ch.epfl.sweng.rps.MainActivity
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.whenStarted
 import ch.epfl.sweng.rps.R
-import ch.epfl.sweng.rps.models.remote.User
+import ch.epfl.sweng.rps.persistence.Cache
 import ch.epfl.sweng.rps.ui.settings.SettingsActivity
 import com.google.android.material.appbar.MaterialToolbar
+import kotlinx.coroutines.launch
 
 
 class ProfileFragment : Fragment() {
-
     private lateinit var viewModel: ProfileViewModel
-    private lateinit var user: User
-    private lateinit var image: ImageView
+    private lateinit var profileImage: ImageView
+
+    init {
+        lifecycleScope.launch {
+            whenStarted {
+                val view = requireView()
+                val cache = Cache.getInstance()
+                cache.getUserDetails()?.let {
+                    view.findViewById<TextView>(R.id.TextEmail).text = it.email
+                    view.findViewById<TextView>(R.id.TextDisplayName).text = it.username
+                    view.findViewById<TextView>(R.id.TextPrivacy).text =
+                        it.games_history_privacy
+                }
+                profileImage = view.findViewById(R.id.profileImage)
+                viewModel.getCachedUserPicture()?.let { profileImage.setImageBitmap(it) }
+                viewModel.getProfilePicture()?.let { profileImage.setImageBitmap(it) }
+            }
+            // This line runs only after the whenStarted block above has completed.
+        }
+    }
+
 
     private val resultLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { res ->
             if (res.resultCode == Activity.RESULT_OK) {
-                val uri: Uri = res.data?.data!!
+                val uri: Uri? = res.data?.data
+                if (uri == null) return@registerForActivityResult
                 val bitmap: Bitmap = getBitmap(requireContext().contentResolver, uri)!!
                 viewModel.updateProfilePicture(bitmap)
-                image.setImageBitmap(bitmap)
+                profileImage.setImageBitmap(bitmap)
             }
         }
 
@@ -46,6 +67,7 @@ class ProfileFragment : Fragment() {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 ImageDecoder.decodeBitmap(ImageDecoder.createSource(contentResolver, fileUri!!))
             } else {
+                @Suppress("DEPRECATION")
                 MediaStore.Images.Media.getBitmap(contentResolver, fileUri)
             }
         } catch (e: Exception) {
@@ -66,16 +88,6 @@ class ProfileFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        user = (activity as MainActivity).getUserDetails()
-        view.findViewById<TextView>(R.id.TextEmail).text = user.email
-        view.findViewById<TextView>(R.id.TextDisplayName).text = user.username
-        view.findViewById<TextView>(R.id.TextPrivacy).text = user.games_history_privacy
-        image = view.findViewById(R.id.profileImage)
-        val cachedimg = viewModel.getCachedUserPicture()
-        cachedimg?.let { image.setImageBitmap(it) }
-        viewModel.getProfilePicture().observe(viewLifecycleOwner) { bitmap ->
-            bitmap?.let { image.setImageBitmap(it) }
-        }
         view.findViewById<MaterialToolbar>(R.id.profile_top_toolbar)
             .setOnMenuItemClickListener { menuItem ->
                 when (menuItem.itemId) {
@@ -89,6 +101,7 @@ class ProfileFragment : Fragment() {
             }
     }
 
+
     private fun getPicture() {
         val intent = Intent()
         intent.type = "image/*"
@@ -96,6 +109,4 @@ class ProfileFragment : Fragment() {
         intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*")
         resultLauncher.launch(intent)
     }
-
-    companion object
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileViewModel.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileViewModel.kt
index fb427451..3e345091 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileViewModel.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/profile/ProfileViewModel.kt
@@ -1,22 +1,18 @@
 package ch.epfl.sweng.rps.ui.profile
 
 import android.graphics.Bitmap
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import ch.epfl.sweng.rps.persistence.Cache
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class ProfileViewModel : ViewModel() {
-    private val cache = Cache.getInstance()!!
-    fun getProfilePicture(): LiveData<Bitmap> {
-        val livedata = MutableLiveData<Bitmap>()
-        viewModelScope.launch(Dispatchers.IO) {
-            livedata.postValue(cache.getUserPictureAsync())
-        }
-        return livedata
+    private val cache = Cache.getInstance()
+
+    suspend fun getProfilePicture(): Bitmap? {
+        return cache.getUserPictureAsync()
     }
 
     fun updateProfilePicture(bitmap: Bitmap) {
@@ -25,7 +21,9 @@ class ProfileViewModel : ViewModel() {
         }
     }
 
-    fun getCachedUserPicture(): Bitmap? {
-        return cache.getUserPicture()
+    suspend fun getCachedUserPicture(): Bitmap? {
+        return withContext(Dispatchers.IO) {
+            cache.getUserPicture()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
index c4a522a9..dd0169cc 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
@@ -188,8 +188,8 @@ class SettingsActivity : AppCompatActivity(),
             }
             findPreference<Preference>(getString(R.string.settings_show_onboard))?.setOnPreferenceClickListener {
                 OnBoardingActivity.launch(
-                    requireContext(),
-                    destination = OnBoardingActivity.Destination.FINISH
+                    requireActivity(),
+                    onDone = OnBoardingActivity.AfterOnboardingAction.FINISH
                 )
                 true
             }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt
index 88e12e79..48ff22dd 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt
@@ -14,7 +14,7 @@ class StatisticsViewModel : ViewModel() {
     fun getStats(position: Int): LiveData<List<UserStat>> {
         val livedata = MutableLiveData<List<UserStat>>()
         viewModelScope.launch(Dispatchers.IO) {
-            livedata.postValue(cache.getStatsDataAsync(position))
+            livedata.postValue(cache.getStatsData(position))
         }
         return livedata
     }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt b/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
index 283ba2b0..75411487 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
@@ -12,8 +12,8 @@ object L {
     fun of(name: String): LogService = instances.getOrPut(name) { LogService(name) }
     fun of(activity: Activity): LogService = of(activity::class.java)
     fun of(fragment: Fragment): LogService = of(fragment::class.java)
-    fun <T> of(clazz: Class<T>): LogService = of(clazz.simpleName)
-    inline fun <reified T> of() = of(T::class.java)
+    fun of(clazz: Class<*>): LogService = of(clazz.simpleName)
+    // inline fun <reified T> of() = of(T::class.java)
 
     fun dispose(name: String) {
         instances[name]?.dispose()
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index ade815d0..c11d71b6 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,33 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/login_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:gravity="center"
+    android:orientation="vertical">
 
 
     <Button
         android:id="@+id/signIn"
-        android:layout_width="180dp"
-        android:layout_height="62dp"
-        android:layout_marginTop="88dp"
-        android:onClick="signIn"
-        android:text="Sign in"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginHorizontal="32dp"
+        android:text="@string/sign_in_with_google" />
 
     <TextView
-        android:id="@+id/userName"
-        android:layout_width="233dp"
-        android:layout_height="45dp"
-        android:layout_marginBottom="144dp"
+        android:id="@+id/not_signed_in_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:fontFamily="@font/montserrat"
-        android:text="Not Logged In"
-        android:textAppearance="@style/TextAppearance.AppCompat.Display1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:paddingHorizontal="32dp"
+        android:layout_marginTop="12dp"
+        android:text="You do not seem to be signed in"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+
+    <!--Here we display a row of a circular progress indicator and a text saying 'loading' -->
+    <LinearLayout
+        android:id="@+id/loading_layout_login"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="48dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="invisible">
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/loading_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true" />
+
+        <android.widget.Space
+            android:layout_width="12dp"
+            android:layout_height="12dp" />
+
+        <TextView
+            android:id="@+id/loading_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/loading"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9974f28..363196a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,4 +99,6 @@
     <string name="placeholder_text">PLACEHOLDER TEXT</string>
     <string name="cancel_text">Cancel</string>§
     <string name="leaderboard">L E A D E R B O A R D</string>
+    <string name="sign_in_with_google">Sign in with Google</string>
+    <string name="loading">Loading...</string>
 </resources>
\ No newline at end of file

From bc9bb140b5757eac58c4fab5432df3a1ce2daced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <gaetan.schwartz@epfl.ch>
Date: Wed, 25 May 2022 19:57:34 +0200
Subject: [PATCH 02/12] fix caching and more

---
 .../java/ch/epfl/sweng/rps/CacheTests.kt      | 21 ++++---
 .../java/ch/epfl/sweng/rps/LoadingActivity.kt | 47 +++++++-------
 .../ch/epfl/sweng/rps/persistence/Cache.kt    | 61 +++++++++----------
 .../sweng/rps/persistence/PrivateStorage.kt   | 32 +++++++++-
 .../rps/ui/onboarding/OnBoardingActivity.kt   |  6 +-
 .../sweng/rps/ui/settings/SettingsActivity.kt |  2 +-
 .../java/ch/epfl/sweng/rps/utils/Utils.kt     | 13 ++++
 7 files changed, 112 insertions(+), 70 deletions(-)

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
index f3fcaa34..e4aa98ad 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
@@ -3,6 +3,7 @@ package ch.epfl.sweng.rps
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
+import android.net.Uri
 import androidx.annotation.ColorInt
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -34,6 +35,7 @@ class CacheTests {
     private lateinit var cacheWithoutAuth: Cache
     private lateinit var storage: Storage
 
+
     @Before
     fun setUp() {
         ServiceLocator.setCurrentEnv(Env.Prod)
@@ -76,6 +78,7 @@ class CacheTests {
     fun cacheCorrectlySavesUser() {
         val user = User(username = "USERNAME", uid = "01234", email = "test@test.org")
         cache.setUserDetails(user)
+        cache.clearLocalVars()
         assertEquals(cache.getUserDetailsFromCache()!!, user)
     }
 
@@ -88,6 +91,7 @@ class CacheTests {
             UserStat(gameId = "12134", date = "14/07/3020", opponents = "Opp2", "Best 1", "0"),
         )
         cache.updateStatsData(lst)
+        cache.clearLocalVars()
         val result = cache.getStatsDataFromCache(0)
         assertEquals(result, lst)
     }
@@ -96,25 +100,25 @@ class CacheTests {
     fun cacheCorrectlySavesLeaderBoardData() {
         assertTrue(cache.getLeaderBoardDataFromCache(0).isEmpty())
         val user1 =
-            LeaderBoardInfo("jinglun", "1", null, 100)
+            LeaderBoardInfo("jinglun", "1", Uri.parse("https://example.com/"), 100)
         val user2 =
             LeaderBoardInfo("Leonardo", "2", null, 80)
         val user3 =
             LeaderBoardInfo("Adam", "3", null, 60)
         val allPlayers = listOf(user1, user2, user3)
         cache.updateLeaderBoardData(allPlayers)
+        cache.clearLocalVars()
         val result = cache.getLeaderBoardDataFromCache(0)
         assertEquals(result, allPlayers)
     }
 
     @Test
-    fun cacheCorrectlySavesProfileImage() {
-        runBlocking {
-            assertNull(cacheWithoutAuth.getUserPicture())
-            val btm = createTestBitmap(30, 30, null)
-            cacheWithoutAuth.updateUserPicture(btm)
-            assertEquals(cacheWithoutAuth.getUserPicture(), btm)
-        }
+    fun cacheCorrectlySavesProfileImage() = runBlocking {
+        assertNull(cacheWithoutAuth.getUserPicture())
+        val btm = createTestBitmap(30, 30, null)
+        cacheWithoutAuth.updateUserPicture(btm)
+        cache.clearLocalVars()
+        assertEquals(cacheWithoutAuth.getUserPicture(), btm)
     }
 
     @Test
@@ -122,6 +126,7 @@ class CacheTests {
         assertNull(cache.getUserPicture())
         val bitmap = createTestBitmap(20, 20, Color.RED)
         storage.writeBackUserPicture(bitmap)
+        cache.clearLocalVars()
         assertNotNull(cache.getUserPicture())
     }
 
diff --git a/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
index 95e88aa4..943d5b51 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
@@ -4,15 +4,14 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import ch.epfl.sweng.rps.persistence.Cache
-import ch.epfl.sweng.rps.services.ServiceLocator
 import ch.epfl.sweng.rps.ui.onboarding.OnBoardingActivity
 import ch.epfl.sweng.rps.utils.FirebaseEmulatorsUtils
 import ch.epfl.sweng.rps.utils.L
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.ktx.initialize
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
 
 class LoadingActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -21,6 +20,22 @@ class LoadingActivity : AppCompatActivity() {
     }
 
 
+    init {
+        lifecycleScope.launchWhenStarted { setupApp() }
+    }
+
+    val startOnboarding =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == OnBoardingActivity.RESULT_ONBOARDING_FINISHED) {
+                log.log("Onboarding finished")
+                hasAlreadyOnboarded = true
+                lifecycleScope.launchWhenStarted {
+                    nav()
+                }
+            }
+        }
+
+
     /**
      * Here logic to setup the app
      */
@@ -53,10 +68,9 @@ class LoadingActivity : AppCompatActivity() {
     val isTest: Boolean
         get() = intent.getBooleanExtra("isTest", false)
 
-    private fun setupApp() {
+    private suspend fun setupApp() {
         // All the logic here is to check if the user is logged in or not
-
-        runBlocking { logic() }
+        logic()
 
         if (!isTest) {
             nav()
@@ -67,17 +81,17 @@ class LoadingActivity : AppCompatActivity() {
     val log = L.of(this)
 
 
-    private fun nav() {
+    private suspend fun nav() {
         log.log("nav")
 
         if (!hasAlreadyOnboarded && OnBoardingActivity.isFirstTime(this)) {
             log.log("nav to onboarding")
-            OnBoardingActivity.launch(this)
+            startOnboarding.launch(OnBoardingActivity.createIntent(this))
             return
         }
-        val isLoggedIn = ServiceLocator.getInstance().repository.rawCurrentUid() != null
-        log.log("isLoggedIn: $isLoggedIn")
-        if (!isLoggedIn) {
+        val user = Cache.getInstance().getUserDetails()
+        log.log("user: $user")
+        if (user == null) {
             log.log("nav to login")
             startActivity(Intent(this, LoginActivity::class.java))
             finish()
@@ -90,21 +104,8 @@ class LoadingActivity : AppCompatActivity() {
 
     private var hasAlreadyOnboarded = false
 
-    override fun onStart() {
-        super.onStart()
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            if (result.resultCode == OnBoardingActivity.RESULT_ONBOARDING_FINISHED) {
-                log.log("Onboarding finished")
-                hasAlreadyOnboarded = true
-                nav()
-            }
-        }
-        setupApp()
-    }
-
 
     companion object {
         const val IS_TEST_EXTRA = "isTest"
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
index b89a26cd..d608326f 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
@@ -11,7 +11,8 @@ import ch.epfl.sweng.rps.remote.FirebaseHelper
 import ch.epfl.sweng.rps.remote.FirebaseRepository
 import ch.epfl.sweng.rps.remote.Repository
 import ch.epfl.sweng.rps.services.ServiceLocator
-import java.net.InetAddress
+import ch.epfl.sweng.rps.utils.L
+import ch.epfl.sweng.rps.utils.isInternetAvailable
 
 
 class Cache private constructor(ctx: Context, val preferFresh: Boolean = false) {
@@ -19,12 +20,20 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
 
     private var user: User? = null
     private var userPicture: Bitmap? = null
-    private lateinit var userStatData: List<UserStat>
-    private lateinit var leaderBoardData: List<LeaderBoardInfo>
+    private var userStatData: List<UserStat>? = null
+    private var leaderBoardData: List<LeaderBoardInfo>? = null
 
     private val repo get() = repoOverride ?: ServiceLocator.getInstance().repository
     private var repoOverride: Repository? = null
 
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun clearLocalVars() {
+        user = null
+        userPicture = null
+        userStatData = null
+        leaderBoardData = null
+    }
+
 
     fun getUserDetailsFromCache(): User? {
         if (user != null) return user
@@ -32,6 +41,8 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return user
     }
 
+    val log = L.of("RPSCache")
+
     suspend fun getUserDetails(): User? {
         val uid = repo.rawCurrentUid()
 
@@ -92,20 +103,20 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
     }
 
     fun getStatsDataFromCache(position: Int): List<UserStat> {
-        if (::userStatData.isInitialized) return userStatData
+        if (userStatData != null) return userStatData!!
         userStatData = storage.getStatsData() ?: listOf()
-        return userStatData
+        return userStatData!!
     }
 
     suspend fun getStatsData(position: Int): List<UserStat> {
         if (!isInternetAvailable()) {
-            Log.d("CACHE", "INTERNET NOT AVAILABLE")
+            log.d("INTERNET NOT AVAILABLE")
             return getStatsDataFromCache(position)
         }
         userStatData = FirebaseHelper.getStatsData(position)
-        Log.d("Cache", userStatData.size.toString())
-        storage.writeBackStatsData(userStatData)
-        return userStatData
+        log.d(userStatData!!.size.toString())
+        storage.writeBackStatsData(userStatData!!)
+        return userStatData!!
     }
 
     fun updateLeaderBoardData(lBData: List<LeaderBoardInfo>) {
@@ -114,38 +125,20 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
     }
 
     fun getLeaderBoardDataFromCache(position: Int): List<LeaderBoardInfo> {
-        if (::leaderBoardData.isInitialized) return leaderBoardData
+        if (leaderBoardData != null) return leaderBoardData!!
         leaderBoardData = storage.getLeaderBoardData() ?: listOf()
-        return leaderBoardData
+        return leaderBoardData!!
     }
 
     suspend fun getLeaderBoardData(position: Int): List<LeaderBoardInfo> {
         if (!isInternetAvailable()) {
-            Log.d("CACHE", "INTERNET NOT AVAILABLE")
+            log.d("INTERNET NOT AVAILABLE")
             return getLeaderBoardDataFromCache(position)
         }
         leaderBoardData = FirebaseHelper.getLeaderBoard(position)
-        Log.d("Cache", leaderBoardData.size.toString())
-        storage.writeBackLeaderBoardData(leaderBoardData)
-        return leaderBoardData
-    }
-
-    private var lastResult = Pair(0L, false)
-
-    private fun isInternetAvailable(): Boolean {
-        val now = System.currentTimeMillis()
-        if (now - lastResult.first < 1000 && lastResult.second)
-            return true
-        val res = try {
-            val ipAddr: InetAddress = InetAddress.getByName("www.google.com")
-            //You can replace it with your name
-            !ipAddr.equals("")
-        } catch (e: Exception) {
-            Log.d("Cache", e.toString())
-            false
-        }
-        lastResult = Pair(now, res)
-        return res
+        log.d(leaderBoardData!!.size.toString())
+        storage.writeBackLeaderBoardData(leaderBoardData!!)
+        return leaderBoardData!!
     }
 
     companion object {
@@ -170,4 +163,6 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
             return cache
         }
     }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt
index f67e50c2..756b0797 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/PrivateStorage.kt
@@ -3,17 +3,22 @@ package ch.epfl.sweng.rps.persistence
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.net.Uri
 import ch.epfl.sweng.rps.models.remote.LeaderBoardInfo
 import ch.epfl.sweng.rps.models.remote.User
 import ch.epfl.sweng.rps.models.ui.UserStat
-import com.google.gson.Gson
+import com.google.gson.*
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
+import java.lang.reflect.Type
 import java.util.*
 
 class PrivateStorage constructor(val context: Context) : Storage {
-    private val gson = Gson()
+    private val gson = GsonBuilder()
+        .registerTypeAdapter(Uri::class.java, UriDeserializer())
+        .registerTypeAdapter(Uri::class.java, UriSerializer())
+        .create()
 
     override fun getFile(file: Storage.FILES): File {
         return File(context.filesDir, file.file)
@@ -79,4 +84,27 @@ class PrivateStorage constructor(val context: Context) : Storage {
             return null
         return BitmapFactory.decodeFile(getFile(Storage.FILES.USERPICTURE).path)
     }
+
+    internal class UriDeserializer : JsonDeserializer<Uri> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): Uri {
+            val uri = json.asString
+            return Uri.parse(uri)
+        }
+    }
+
+    internal class UriSerializer : JsonSerializer<Uri> {
+        override fun serialize(
+            src: Uri?,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ): JsonElement {
+            if (src == null)
+                return JsonNull.INSTANCE
+            return JsonPrimitive(src.toString())
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt
index a19a9dc0..4013c1ff 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/onboarding/OnBoardingActivity.kt
@@ -32,13 +32,13 @@ class OnBoardingActivity : AppCompatActivity() {
             ).apply()
         }
 
-        fun launch(
+        fun createIntent(
             context: Activity,
             onDone: AfterOnboardingAction = AfterOnboardingAction.FINISH
-        ) {
+        ): Intent {
             val intent = Intent(context, OnBoardingActivity::class.java)
             intent.putExtra(AFTER_ONBOARDING_DONE_EXTRA, onDone)
-            context.startActivityForResult(intent, 0)
+            return intent
         }
 
         const val RESULT_ONBOARDING_FINISHED = 0x42069
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
index dd0169cc..94641496 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
@@ -187,7 +187,7 @@ class SettingsActivity : AppCompatActivity(),
                 true
             }
             findPreference<Preference>(getString(R.string.settings_show_onboard))?.setOnPreferenceClickListener {
-                OnBoardingActivity.launch(
+                OnBoardingActivity.createIntent(
                     requireActivity(),
                     onDone = OnBoardingActivity.AfterOnboardingAction.FINISH
                 )
diff --git a/app/src/main/java/ch/epfl/sweng/rps/utils/Utils.kt b/app/src/main/java/ch/epfl/sweng/rps/utils/Utils.kt
index e467ea70..13e2525a 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/utils/Utils.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/utils/Utils.kt
@@ -12,6 +12,7 @@ import com.google.firebase.functions.FirebaseFunctions
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.delay
+import java.net.InetAddress
 
 fun consume(block: () -> Any?): () -> Unit = { block() }
 
@@ -91,3 +92,15 @@ inline fun <reified T> List<DocumentSnapshot>.toListOf(): List<T> =
 
 inline fun <reified T> List<DocumentSnapshot>.toListOfNullable(): List<T?> =
     map { it.toObject(T::class.java) }
+
+fun isInternetAvailable(): Boolean {
+    val res = try {
+        val ipAddr: InetAddress = InetAddress.getByName("www.google.com")
+        //You can replace it with your name
+        !ipAddr.equals("")
+    } catch (e: Exception) {
+        Log.d("Cache", e.toString())
+        false
+    }
+    return res
+}

From 34c0aeaed1bea945af02235efb3eac553d18c241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <gaetan.schwartz@epfl.ch>
Date: Wed, 25 May 2022 20:04:34 +0200
Subject: [PATCH 03/12] ocd here and there

---
 .../java/ch/epfl/sweng/rps/CacheTests.kt      | 26 +++++++------------
 .../ch/epfl/sweng/rps/persistence/Cache.kt    |  6 -----
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
index e4aa98ad..a08153d7 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
@@ -23,7 +23,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
@@ -66,12 +65,10 @@ class CacheTests {
     }
 
     @Test
-    fun cacheCorrectlyRetrievesUserDetailsFromStorage() {
-        runBlocking {
-            assertNull(cacheWithoutAuth.getUserDetailsFromCache())
-            cacheWithoutAuth.updateUserDetails(User(uid = "RAND"))
-            assertEquals(cacheWithoutAuth.getUserDetailsFromCache()?.uid, "RAND")
-        }
+    fun cacheCorrectlyRetrievesUserDetailsFromStorage() = runBlocking {
+        assertNull(cacheWithoutAuth.getUserDetailsFromCache())
+        cacheWithoutAuth.setUserDetails(User(uid = "RAND"))
+        assertEquals(cacheWithoutAuth.getUserDetailsFromCache()?.uid, "RAND")
     }
 
     @Test
@@ -115,7 +112,7 @@ class CacheTests {
     @Test
     fun cacheCorrectlySavesProfileImage() = runBlocking {
         assertNull(cacheWithoutAuth.getUserPicture())
-        val btm = createTestBitmap(30, 30, null)
+        val btm = createTestBitmap(30, 30, Color.GREEN)
         cacheWithoutAuth.updateUserPicture(btm)
         cache.clearLocalVars()
         assertEquals(cacheWithoutAuth.getUserPicture(), btm)
@@ -131,17 +128,12 @@ class CacheTests {
     }
 
     private fun createTestBitmap(w: Int, h: Int, @ColorInt color: Int?): Bitmap {
-        var c = color
+        val c = color ?: intArrayOf(
+            Color.BLUE, Color.GREEN, Color.RED,
+            Color.YELLOW, Color.WHITE
+        ).random()
         val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
-        if (c == null) {
-            val colors = intArrayOf(
-                Color.BLUE, Color.GREEN, Color.RED,
-                Color.YELLOW, Color.WHITE
-            )
-            val rgen = Random()
-            c = colors[rgen.nextInt(colors.size - 1)]
-        }
         canvas.drawColor(c)
         return bitmap
     }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
index d608326f..a3b839ef 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
@@ -57,12 +57,6 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return user
     }
 
-    suspend fun updateUserDetails(user: User, vararg pairs: Pair<User.Field, Any>) {
-        this.user = user
-        storage.writeBackUser(user)
-        repo.updateUser(*pairs)
-    }
-
     fun setUserDetails(user: User?) {
         if (user == null) {
             this.user = null

From c037db95f0673c488695c913c56c6f156d4ef85e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <gaetan.schwartz@epfl.ch>
Date: Wed, 25 May 2022 20:22:49 +0200
Subject: [PATCH 04/12] fix a test

---
 .../ch/epfl/sweng/rps/ProfileFragmentTest.kt  | 36 +++++++------------
 .../java/ch/epfl/sweng/rps/TestUtils.kt       |  3 ++
 .../ch/epfl/sweng/rps/persistence/Cache.kt    |  7 ++++
 .../epfl/sweng/rps/remote/LocalRepository.kt  |  8 ++---
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/ProfileFragmentTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/ProfileFragmentTest.kt
index a0a0df9e..9355b760 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/ProfileFragmentTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/ProfileFragmentTest.kt
@@ -1,7 +1,6 @@
 package ch.epfl.sweng.rps
 
 import android.content.Intent
-import android.os.Bundle
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.click
@@ -9,36 +8,19 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.platform.app.InstrumentationRegistry
-import ch.epfl.sweng.rps.TestUtils.initializeForTest
 import ch.epfl.sweng.rps.models.remote.User
-import com.google.firebase.ktx.Firebase
+import ch.epfl.sweng.rps.persistence.Cache
 import org.junit.Rule
 import org.junit.Test
 
 
 class ProfileFragmentTest {
 
-    private val bundle = run {
-        val b: Bundle = Bundle()
-        val data = mapOf(
-            "email" to "asd@gmail.com",
-            "display_name" to "asdino",
-            "uid" to "123",
-            "privacy" to User.Privacy.PUBLIC.toString()
-        )
-        data.forEach { (k, v) -> b.putString(k, v) }
-        b
-    }
-
-
     private fun createIntent(): Intent {
-        Firebase.initializeForTest()
-        val i: Intent = Intent(
+        return Intent(
             InstrumentationRegistry.getInstrumentation().targetContext,
             MainActivity::class.java
         )
-        i.putExtra("User", bundle)
-        return i
     }
 
     @get:Rule
@@ -46,10 +28,18 @@ class ProfileFragmentTest {
 
     @Test
     fun testFields() {
+        val user = User(
+            username = "test",
+            uid = "uid",
+            games_history_privacy = User.Privacy.PUBLIC.name,
+            has_profile_photo = false,
+            email = "email",
+        )
+        Cache.getInstance().setUserDetails(user)
         onView(withId(R.id.nav_profile)).perform(click())
-        onView(withId(R.id.TextDisplayName)).check(matches(withText(bundle.getString("display_name"))))
-        onView(withId(R.id.TextEmail)).check(matches(withText(bundle.getString("email"))))
-        onView(withId(R.id.TextPrivacy)).check(matches(withText(bundle.getString("privacy"))))
+        onView(withId(R.id.TextDisplayName)).check(matches(withText(user.username)))
+        onView(withId(R.id.TextEmail)).check(matches(withText(user.email)))
+        onView(withId(R.id.TextPrivacy)).check(matches(withText(user.games_history_privacy)))
     }
 
     @Test
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/TestUtils.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/TestUtils.kt
index d33f66be..cca98022 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/TestUtils.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/TestUtils.kt
@@ -13,6 +13,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
 import androidx.test.runner.lifecycle.Stage
 import ch.epfl.sweng.rps.TestUtils.initializeForTest
+import ch.epfl.sweng.rps.persistence.Cache
 import ch.epfl.sweng.rps.remote.Env
 import ch.epfl.sweng.rps.services.ServiceLocator
 import com.google.firebase.FirebaseApp
@@ -170,9 +171,11 @@ class ActivityScenarioRuleWithSetup<A : Activity?> : ExternalResource {
             {
                 ServiceLocator.setCurrentEnv(Env.Test)
                 Firebase.initializeForTest()
+                Cache.initialize(InstrumentationRegistry.getInstrumentation().targetContext)
                 ServiceLocator.localRepository.setCurrentUid("test")
             },
             {
+                Cache.getInstance().clear()
                 FirebaseAuth.getInstance().signOut()
                 FirebaseApp.clearInstancesForTest()
                 ServiceLocator.setCurrentEnv(Env.Prod)
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
index a3b839ef..5d638328 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
@@ -135,6 +135,13 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return leaderBoardData!!
     }
 
+    fun clear() {
+        clearLocalVars()
+        for (file in Storage.FILES.values()) {
+            storage.deleteFile(file)
+        }
+    }
+
     companion object {
         lateinit var cache: Cache
 
diff --git a/app/src/main/java/ch/epfl/sweng/rps/remote/LocalRepository.kt b/app/src/main/java/ch/epfl/sweng/rps/remote/LocalRepository.kt
index cd6ae975..c566c718 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/remote/LocalRepository.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/remote/LocalRepository.kt
@@ -27,7 +27,7 @@ class LocalRepository(private var uid: String? = null) : Repository, GamesReposi
     }
 
     override suspend fun updateUser(vararg pairs: Pair<User.Field, Any>) {
-        var user = getUser(getCurrentUid())
+        var user = getUser(getCurrentUid())!!
         pairs.forEach {
             user = when (it.first) {
                 User.Field.EMAIL -> user.copy(email = it.second as String)
@@ -44,12 +44,12 @@ class LocalRepository(private var uid: String? = null) : Repository, GamesReposi
         return uid
     }
 
-    override suspend fun getUser(uid: String): User {
-        return users[uid]!!
+    override suspend fun getUser(uid: String): User? {
+        return users[uid]
     }
 
     override suspend fun getUserProfilePictureUrl(uid: String): URI? {
-        val cond = getUser(uid).has_profile_photo
+        val cond = getUser(uid)!!.has_profile_photo
         return if (cond) {
             URI("https://cdn.pixabay.com/photo/2015/10/05/22/37/blank-profile-picture-973460_960_720.png")
         } else {

From 04c414ce883b1eb9f4026ee6a9bcb767344fb68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <gaetan.schwartz@epfl.ch>
Date: Wed, 25 May 2022 20:35:53 +0200
Subject: [PATCH 05/12] oops

---
 .../java/ch/epfl/sweng/rps/remote/LocalRepositoryTest.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/test/java/ch/epfl/sweng/rps/remote/LocalRepositoryTest.kt b/app/src/test/java/ch/epfl/sweng/rps/remote/LocalRepositoryTest.kt
index ac737764..5df91483 100644
--- a/app/src/test/java/ch/epfl/sweng/rps/remote/LocalRepositoryTest.kt
+++ b/app/src/test/java/ch/epfl/sweng/rps/remote/LocalRepositoryTest.kt
@@ -23,7 +23,7 @@ class LocalRepositoryTest {
         assertEquals("user1234", localRepository.getCurrentUid())
 
         localRepository.createThisUser("User", "user@company.org")
-        val user = localRepository.getUser(localRepository.getCurrentUid())
+        val user = localRepository.getUser(localRepository.getCurrentUid())!!
         assertEquals("User", user.username)
         assertEquals("user@company.org", user.email)
         assertEquals("user1234", user.uid)
@@ -37,7 +37,7 @@ class LocalRepositoryTest {
             User.Field.GAMES_HISTORY_PRIVACY to User.Privacy.PRIVATE.name,
             User.Field.HAS_PROFILE_PHOTO to true,
         )
-        val updatedUser = localRepository.getUser(localRepository.getCurrentUid())
+        val updatedUser = localRepository.getUser(localRepository.getCurrentUid())!!
         assertEquals("NewUser", updatedUser.username)
         assertEquals("example@example.com", updatedUser.email)
         assertEquals("user1234", updatedUser.uid)
@@ -52,7 +52,7 @@ class LocalRepositoryTest {
         assertEquals("user1234", localRepository.getCurrentUid())
 
         localRepository.createThisUser("User", "user@company.org")
-        val user = localRepository.getUser(localRepository.getCurrentUid())
+        val user = localRepository.getUser(localRepository.getCurrentUid())!!
         assertEquals("User", user.username)
         assertEquals("user@company.org", user.email)
 
@@ -60,7 +60,7 @@ class LocalRepositoryTest {
         assertEquals("user5678", localRepository.getCurrentUid())
 
         localRepository.createThisUser(null, "email@email.com")
-        val user2 = localRepository.getUser(localRepository.getCurrentUid())
+        val user2 = localRepository.getUser(localRepository.getCurrentUid())!!
         assertEquals("", user2.username)
         assertEquals("email@email.com", user2.email)
     }

From a6ba96a3d9c0aebafc65039ec788659119199a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <gaetan.schwartz@epfl.ch>
Date: Wed, 25 May 2022 20:59:56 +0200
Subject: [PATCH 06/12] fix tests oops

---
 .../ch/epfl/sweng/rps/SettingsPageTest.kt     | 34 +++++++++----------
 .../sweng/rps/ui/settings/SettingsActivity.kt |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/SettingsPageTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/SettingsPageTest.kt
index b48a0b38..5122ab29 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/SettingsPageTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/SettingsPageTest.kt
@@ -55,12 +55,10 @@ class SettingsPageTest {
         return themeIdToAppCompatThemeId[themeId]!!
     }
 
-    private fun getThemeIdFromAppCompatTheme(appCompatThemeId: Int): String {
-        val filtered = themeIdToAppCompatThemeId.entries.filter { it.value == appCompatThemeId }
-        if (filtered.isEmpty()) {
-            throw IllegalArgumentException("No theme id found for appCompatThemeId $appCompatThemeId")
-        }
-        return filtered.first().key
+    private fun getThemeIdFromAppCompatTheme(appCompatThemeId: Int): String? {
+        val filtered =
+            themeIdToAppCompatThemeId.entries.firstOrNull { it.value == appCompatThemeId }
+        return filtered?.key
     }
 
 
@@ -84,21 +82,23 @@ class SettingsPageTest {
         // the activity's onPause method has been called at this point
         scenarioRule.scenario.moveToState(Lifecycle.State.RESUMED)
 
-        for (entry in computeThemeMap()) {
-            Log.i("SettingsPageTest", "Testing theme ${entry.key}")
+        for ((key, value) in computeThemeMap()) {
+            Log.i("SettingsPageTest", "Testing theme ${key}")
             onView(withText(R.string.theme_mode)).perform(click())
-            onView(withText(entry.key)).perform(click())
+            onView(withText(key)).perform(click())
             onView(isRoot()).perform(waitFor(1000))
 
             val appCompatThemeId = getCurrentNightMode()
-
-            assertEquals(
-                getAppCompatThemeFromThemeId(entry.value),
-                appCompatThemeId,
-                "Theme should be ${entry.value} (${getAppCompatThemeFromThemeId(entry.value)}) after clicking ${entry.key}, but is $appCompatThemeId (${
-                    getThemeIdFromAppCompatTheme(appCompatThemeId)
-                })"
-            )
+            val themeId = getAppCompatThemeFromThemeId(value)
+            if (appCompatThemeId != AppCompatDelegate.MODE_NIGHT_UNSPECIFIED) {
+                assertEquals(
+                    themeId,
+                    appCompatThemeId,
+                    "Theme should be $value ($themeId) after clicking $key, but is $appCompatThemeId (${
+                        getThemeIdFromAppCompatTheme(appCompatThemeId)
+                    })"
+                )
+            }
 
         }
     }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
index 94641496..39e34997 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
@@ -190,7 +190,7 @@ class SettingsActivity : AppCompatActivity(),
                 OnBoardingActivity.createIntent(
                     requireActivity(),
                     onDone = OnBoardingActivity.AfterOnboardingAction.FINISH
-                )
+                ).apply { startActivity(this) }
                 true
             }
             val gameSettings =

From 6a643d7ecada5c23b460e6875a7c7b53903eec12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <blaxoujunior@gmail.com>
Date: Thu, 26 May 2022 16:14:25 +0200
Subject: [PATCH 07/12] cleanup

---
 app/build.gradle                              |  7 ++-
 .../ch/epfl/sweng/rps/LoadingActivityTest.kt  |  9 +++
 .../java/ch/epfl/sweng/rps/LoadingActivity.kt | 20 +++----
 .../java/ch/epfl/sweng/rps/MainActivity.kt    | 58 +++----------------
 .../sweng/rps/ui/settings/SettingsActivity.kt | 29 +++++-----
 .../ch/epfl/sweng/rps/utils/ChangeNotifier.kt | 27 ++++++---
 .../main/java/ch/epfl/sweng/rps/utils/L.kt    |  6 ++
 7 files changed, 71 insertions(+), 85 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 69df2a42..5cc97c5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,7 +81,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.gms:play-services-auth:20.2.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
@@ -89,7 +89,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
     implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.databinding:databinding-runtime:7.2.0'
+    implementation 'androidx.databinding:databinding-runtime:7.2.1'
     implementation 'androidx.fragment:fragment-ktx:1.4.1'
     implementation 'com.google.firebase:firebase-appcheck:16.0.0'
     testImplementation 'junit:junit:4.13.2'
@@ -118,7 +118,7 @@ dependencies {
     }
 
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:30.0.1')
+    implementation platform('com.google.firebase:firebase-bom:30.0.2')
 
     // Declare the dependency for the Cloud Firestore library
     // When using the BoM, you don't specify versions in Firebase library dependencies
@@ -147,6 +147,7 @@ dependencies {
     androidTestImplementation "io.mockk:mockk-android:1.12.2"
 
     //Declare the dependency for camera related functions
+    // https://developer.android.com/jetpack/androidx/releases/camera
     def camerax_version = "1.1.0-rc01"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
index 0a35eed3..8a9d7351 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
@@ -27,4 +27,13 @@ class LoadingActivityTest {
     fun start() {
         onView(withId(R.id.loadingActivityProgressBar)).check(matches(isDisplayed()))
     }
+
+    @Test
+    fun testNav() {
+        rule.scenario.onActivity {
+            onView(withId(R.id.loadingActivityProgressBar)).check(matches(isDisplayed()))
+            it.nav()
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
index 943d5b51..76ec4ab1 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/LoadingActivity.kt
@@ -3,10 +3,12 @@ package ch.epfl.sweng.rps
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import ch.epfl.sweng.rps.persistence.Cache
 import ch.epfl.sweng.rps.ui.onboarding.OnBoardingActivity
+import ch.epfl.sweng.rps.ui.settings.SettingsActivity
 import ch.epfl.sweng.rps.utils.FirebaseEmulatorsUtils
 import ch.epfl.sweng.rps.utils.L
 import com.google.firebase.ktx.Firebase
@@ -24,7 +26,7 @@ class LoadingActivity : AppCompatActivity() {
         lifecycleScope.launchWhenStarted { setupApp() }
     }
 
-    val startOnboarding =
+    private val startOnBoarding =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == OnBoardingActivity.RESULT_ONBOARDING_FINISHED) {
                 log.log("Onboarding finished")
@@ -45,12 +47,9 @@ class LoadingActivity : AppCompatActivity() {
         Firebase.initialize(this@LoadingActivity)
         Cache.initialize(this@LoadingActivity)
         useEmulatorsIfNeeded()
-        delay(1000)
-    }
+        SettingsActivity.applyTheme(this)
 
-    private fun openLogin() {
-        val intent = Intent(this, LoginActivity::class.java)
-        startActivity(intent)
+        delay(1000)
     }
 
     private fun useEmulatorsIfNeeded() {
@@ -68,7 +67,8 @@ class LoadingActivity : AppCompatActivity() {
     val isTest: Boolean
         get() = intent.getBooleanExtra("isTest", false)
 
-    private suspend fun setupApp() {
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    suspend fun setupApp() {
         // All the logic here is to check if the user is logged in or not
         logic()
 
@@ -80,13 +80,13 @@ class LoadingActivity : AppCompatActivity() {
 
     val log = L.of(this)
 
-
-    private suspend fun nav() {
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    suspend fun nav() {
         log.log("nav")
 
         if (!hasAlreadyOnboarded && OnBoardingActivity.isFirstTime(this)) {
             log.log("nav to onboarding")
-            startOnboarding.launch(OnBoardingActivity.createIntent(this))
+            startOnBoarding.launch(OnBoardingActivity.createIntent(this))
             return
         }
         val user = Cache.getInstance().getUserDetails()
diff --git a/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
index 8b37dcdc..6c31b1ed 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
@@ -1,50 +1,18 @@
 package ch.epfl.sweng.rps
 
 import android.os.Bundle
-import android.util.Log
-import android.view.Menu
-import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
-import androidx.preference.PreferenceManager
 import ch.epfl.sweng.rps.databinding.ActivityMainBinding
-import ch.epfl.sweng.rps.ui.settings.SettingsActivity
 import com.google.android.material.bottomnavigation.BottomNavigationView
 
 class MainActivity : AppCompatActivity() {
-
-    private val sharedPreferences by lazy {
-        PreferenceManager.getDefaultSharedPreferences(this)
-    }
-
     private lateinit var binding: ActivityMainBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        SettingsActivity.applyTheme(getString(R.string.theme_pref_key), sharedPreferences)
         super.onCreate(savedInstanceState)
-        cache = Cache.getInstance() ?: Cache.createInstance(this)
-
-        if(intent.action.equals("fromCamera")){
-            val extras = intent.extras
-            if (extras != null) {
-                val value = extras.getString("result")
-                Toast.makeText(this, "The pose $value was detected", Toast.LENGTH_SHORT).show()
-            }
-        } else {
-            val userData: Bundle? = intent.extras?.getBundle("User")
-            if (userData != null) {
-                currentUser = User(
-                    userData.getString("display_name"),
-                    userData.getString("uid")!!,
-                    userData.getString("privacy")!!,
-                    false,
-                    userData.getString("email")
-                )
-            }
-        }
-
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -53,25 +21,17 @@ class MainActivity : AppCompatActivity() {
         val navController = findNavController(R.id.nav_host_fragment_activity_main)
 
         navView.setupWithNavController(navController)
-
     }
 
-    /*  private fun setupNav() {
-          val navController = findNavController(R.id.nav_host_fragment_activity_main)
-          val navView: BottomNavigationView = binding.navView
-          navView.setupWithNavController(navController)
+    override fun onStart() {
+        super.onStart()
 
-          //removes botttomNavView for specified fragments.
-          navController.addOnDestinationChangedListener { _, destination, _ ->
-              when (destination.id) {
-                  R.id.gameFragment -> setBottomNavigationVisibility(View.GONE)
-                  else -> setBottomNavigationVisibility(View.VISIBLE)
-              }
-          }
-      }
-
-    private fun setBottomNavigationVisibility(visibility: Int) {
-        // get the reference of the bottomNavigationView and set the visibility.
-        binding.navView.visibility = visibility
+        if (intent.action.equals("fromCamera")) {
+            val extras = intent.extras
+            if (extras != null) {
+                val value = extras.getString("result")
+                Toast.makeText(this, "The pose $value was detected", Toast.LENGTH_SHORT).show()
+            }
+        }
     }
 }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
index 39e34997..900884c2 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
@@ -20,6 +20,7 @@ import ch.epfl.sweng.rps.services.ProdServiceLocator
 import ch.epfl.sweng.rps.services.ServiceLocator
 import ch.epfl.sweng.rps.ui.onboarding.OnBoardingActivity
 import ch.epfl.sweng.rps.utils.FirebaseEmulatorsUtils
+import ch.epfl.sweng.rps.utils.L
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.google.firebase.Timestamp
 import kotlinx.coroutines.launch
@@ -32,7 +33,7 @@ class SettingsActivity : AppCompatActivity(),
     companion object {
         private const val TITLE_TAG = "settingsActivityTitle"
 
-        fun applyTheme(
+        private fun applyTheme(
             themeKey: String,
             sharedPreferences: SharedPreferences
         ) {
@@ -46,8 +47,18 @@ class SettingsActivity : AppCompatActivity(),
                 "system" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
                 }
+                else -> {
+                    L.of(SettingsActivity::class.java).e("Unknown theme: $themeKey")
+                }
             }
+        }
 
+        fun applyTheme(context: Context, sharedPreferences: SharedPreferences?) {
+            val prefs = sharedPreferences ?: PreferenceManager.getDefaultSharedPreferences(context)
+            applyTheme(
+                context.getString(R.string.theme_pref_key),
+                prefs
+            )
         }
     }
 
@@ -236,21 +247,7 @@ class SettingsActivity : AppCompatActivity(),
                 }
                 true
             }
-
         }
-
-
-//    class AppearanceFragment : PreferenceFragmentCompat() {
-//        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-//            setPreferencesFromResource(R.xml.appearance_preferences, rootKey)
-//        }
-//    }
-//
-//    class SyncFragment : PreferenceFragmentCompat() {
-//        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-//            setPreferencesFromResource(R.xml.sync_preferences, rootKey)
-//        }
-//    }
     }
 
     override fun onResume() {
@@ -268,6 +265,6 @@ class SettingsActivity : AppCompatActivity(),
         key: String?
     ) {
         val themeKey = getString(R.string.theme_pref_key)
-        if (key == themeKey) applyTheme(themeKey, sharedPreferences ?: return)
+        if (key == themeKey) applyTheme(this, sharedPreferences)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt b/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt
index 84e7aec9..343374d6 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt
@@ -7,8 +7,10 @@ import kotlin.coroutines.resume
 open class ChangeNotifier<T> where  T : ChangeNotifier<T> {
     private val listeners = ArrayList<() -> Unit>()
     val listenerCount get() = listeners.size
+    private var debugDisposed = false
 
     fun notifyListeners() {
+        ensureNotDisposed()
         for (n in listeners) {
             try {
                 n()
@@ -22,10 +24,12 @@ open class ChangeNotifier<T> where  T : ChangeNotifier<T> {
     }
 
     fun addListener(listener: () -> Unit) {
+        ensureNotDisposed()
         listeners.add(listener)
     }
 
     fun removeListener(listener: () -> Unit) {
+        ensureNotDisposed()
         if (!listeners.remove(listener)) {
             throw ListenerNotFoundException(
                 "Listener to remove was not found. " +
@@ -34,24 +38,33 @@ open class ChangeNotifier<T> where  T : ChangeNotifier<T> {
         }
     }
 
+    private fun ensureNotDisposed() {
+        if (debugDisposed) {
+            throw Exception(
+                "This ${this::class.java.simpleName} has been disposed and cannot be used anymore."
+            )
+        }
+    }
+
     @CallSuper
     open fun dispose() {
         listeners.clear()
+        debugDisposed = true
     }
 
-    @Suppress("UNCHECKED_CAST")
-    suspend fun awaitFor(predicate: (T) -> Boolean) =
-        suspendCancellableCoroutine<Unit> { cont ->
+    suspend fun awaitFor(predicate: (T) -> Boolean) {
+        ensureNotDisposed()
+        suspendCancellableCoroutine<Unit> {
+            @Suppress("UNCHECKED_CAST")
             val listener = {
                 if (predicate(this@ChangeNotifier as T)) {
-                    cont.resume(Unit)
+                    it.resume(Unit)
                 }
             }
             addListener(listener)
-            cont.invokeOnCancellation {
-                removeListener(listener)
-            }
+            it.invokeOnCancellation { removeListener(listener) }
         }
+    }
 
     class ListenerException : Exception {
         constructor(message: String?, cause: Throwable?) : super(message, cause)
diff --git a/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt b/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
index 75411487..f585d6b1 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
@@ -13,6 +13,12 @@ object L {
     fun of(activity: Activity): LogService = of(activity::class.java)
     fun of(fragment: Fragment): LogService = of(fragment::class.java)
     fun of(clazz: Class<*>): LogService = of(clazz.simpleName)
+
+    fun Log.of(name: String): LogService = L.of(name)
+    fun Log.of(activity: Activity): LogService = L.of(activity)
+    fun Log.of(fragment: Fragment): LogService = L.of(fragment)
+    fun Log.of(clazz: Class<*>): LogService = L.of(clazz)
+
     // inline fun <reified T> of() = of(T::class.java)
 
     fun dispose(name: String) {

From 09ab95b34f74c0fe9937f17e4238b0eeee9926b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <blaxoujunior@gmail.com>
Date: Thu, 26 May 2022 17:29:09 +0200
Subject: [PATCH 08/12] oops

---
 .../ui/camera/CameraXLivePreviewActivity.kt   | 298 +++++++++---------
 .../sweng/rps/ui/camera/CameraXViewModel.kt   |  10 +-
 .../ch/epfl/sweng/rps/ui/home/HomeFragment.kt |   5 +-
 .../sweng/rps/ui/settings/SettingsActivity.kt |   5 +-
 4 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXLivePreviewActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXLivePreviewActivity.kt
index 0b7ecf94..cc6d1773 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXLivePreviewActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXLivePreviewActivity.kt
@@ -18,16 +18,13 @@ package ch.epfl.sweng.rps.ui.camera
 
 
 import android.Manifest
-import android.app.Activity
 import android.content.Intent
-import android.os.Build.VERSION_CODES
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.util.Log
 import android.util.Size
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
@@ -50,165 +47,176 @@ import com.google.mlkit.vision.label.custom.CustomImageLabelerOptions
 
 /** Live preview demo app for ML Kit APIs using CameraX. */
 @KeepName
-@RequiresApi(VERSION_CODES.LOLLIPOP)
 class CameraXLivePreviewActivity :
-  AppCompatActivity() {
-
-  private var previewView: PreviewView? = null
-  private var graphicOverlay: GraphicOverlay? = null
-  private var cameraProvider: ProcessCameraProvider? = null
-  private var previewUseCase: Preview? = null
-  private var analysisUseCase: ImageAnalysis? = null
-  private var imageProcessor: VisionImageProcessor? = null
-  private var lensFacing = CameraSelector.LENS_FACING_BACK
-  private var cameraSelector: CameraSelector? = null
-  private var targetResolution: Size = Size(960, 1280)
-  private var model: CameraXViewModel? = null
-
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    Log.d(TAG, "onCreate")
-    requestPermission.launch(Manifest.permission.CAMERA)
-
-    cameraSelector = CameraSelector.Builder().requireLensFacing(lensFacing).build()
-    setContentView(R.layout.activity_vision_camerax_live_preview)
-    previewView = findViewById(R.id.preview_view)
-    if (previewView == null) {
-      Log.d(TAG, "previewView is null")
-    }
-    graphicOverlay = findViewById(R.id.graphic_overlay)
-    if (graphicOverlay == null) {
-      Log.d(TAG, "graphicOverlay is null")
-    }
-
-    model = ViewModelProvider(this, ViewModelProvider.AndroidViewModelFactory.getInstance(application))[CameraXViewModel::class.java]
-
-    model!!.processCameraProvider
-      .observe(
-        this,
-        Observer { provider: ProcessCameraProvider? ->
-          cameraProvider = provider
-          bindAllCameraUseCases()
+    AppCompatActivity() {
+
+    private var previewView: PreviewView? = null
+    private var graphicOverlay: GraphicOverlay? = null
+    private var cameraProvider: ProcessCameraProvider? = null
+    private var previewUseCase: Preview? = null
+    private var analysisUseCase: ImageAnalysis? = null
+    private var imageProcessor: VisionImageProcessor? = null
+    private var lensFacing = CameraSelector.LENS_FACING_BACK
+    private var cameraSelector: CameraSelector? = null
+    private var targetResolution: Size = Size(960, 1280)
+    private var model: CameraXViewModel? = null
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Log.d(TAG, "onCreate")
+        requestPermission.launch(Manifest.permission.CAMERA)
+
+        cameraSelector = CameraSelector.Builder().requireLensFacing(lensFacing).build()
+        setContentView(R.layout.activity_vision_camerax_live_preview)
+        previewView = findViewById(R.id.preview_view)
+        if (previewView == null) {
+            Log.d(TAG, "previewView is null")
         }
-      )
-    model!!.running
-      .observe(
-        this,
-        Observer { result: String ->
-           Intent(this, MainActivity::class.java )
-             .putExtra("result", result)
-             .setAction("fromCamera").also{
-             startActivity(it)
-          }
+        graphicOverlay = findViewById(R.id.graphic_overlay)
+        if (graphicOverlay == null) {
+            Log.d(TAG, "graphicOverlay is null")
         }
-      )
 
+        model = ViewModelProvider(
+            this,
+            ViewModelProvider.AndroidViewModelFactory.getInstance(application)
+        )[CameraXViewModel::class.java]
+
+        model!!.processCameraProvider
+            .observe(
+                this,
+                Observer { provider: ProcessCameraProvider? ->
+                    cameraProvider = provider
+                    bindAllCameraUseCases()
+                }
+            )
+        model!!.running
+            .observe(
+                this,
+                Observer { result: String ->
+                    Intent(this, MainActivity::class.java)
+                        .putExtra("result", result)
+                        .setAction("fromCamera").also {
+                            startActivity(it)
+                        }
+                }
+            )
 
-  }
-  private val requestPermission = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-    //Callback what to do with the response of the permissions
-    if (isGranted) {
-      // permission granted continue the normal workflow of app
-      Log.i("DEBUG", "permission granted")
-    } else {
-      Log.i("DEBUG", "permission denied")
-    }
-  }
 
+    }
 
-  public override fun onResume() {
-    super.onResume()
-    bindAllCameraUseCases()
-  }
+    private val requestPermission =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+            //Callback what to do with the response of the permissions
+            if (isGranted) {
+                // permission granted continue the normal workflow of app
+                Log.i("DEBUG", "permission granted")
+            } else {
+                Log.i("DEBUG", "permission denied")
+            }
+        }
 
-  override fun onPause() {
-    super.onPause()
 
-    imageProcessor?.run { this.stop() }
-  }
+    public override fun onResume() {
+        super.onResume()
+        bindAllCameraUseCases()
+    }
 
-  public override fun onDestroy() {
-    super.onDestroy()
-    imageProcessor?.run { this.stop() }
-  }
+    override fun onPause() {
+        super.onPause()
 
-  private fun bindAllCameraUseCases() {
-    if (cameraProvider != null) {
-      // As required by CameraX API, unbinds all use cases before trying to re-bind any of them.
-      cameraProvider!!.unbindAll()
-      bindPreviewUseCase()
-      bindAnalysisUseCase()
+        imageProcessor?.run { this.stop() }
     }
-  }
 
-  private fun bindPreviewUseCase() {
-    if (cameraProvider == null) {
-      return
+    public override fun onDestroy() {
+        super.onDestroy()
+        imageProcessor?.run { this.stop() }
     }
-    if (previewUseCase != null) {
-      cameraProvider!!.unbind(previewUseCase)
+
+    private fun bindAllCameraUseCases() {
+        if (cameraProvider != null) {
+            // As required by CameraX API, unbinds all use cases before trying to re-bind any of them.
+            cameraProvider!!.unbindAll()
+            bindPreviewUseCase()
+            bindAnalysisUseCase()
+        }
     }
 
-    val builder = Preview.Builder()
-    builder.setTargetResolution(targetResolution)
-    previewUseCase = builder.build()
-    previewUseCase!!.setSurfaceProvider(previewView!!.surfaceProvider)
-    cameraProvider!!.bindToLifecycle(/* lifecycleOwner= */ this, cameraSelector!!, previewUseCase)
-  }
+    private fun bindPreviewUseCase() {
+        if (cameraProvider == null) {
+            return
+        }
+        if (previewUseCase != null) {
+            cameraProvider!!.unbind(previewUseCase)
+        }
 
-  private fun bindAnalysisUseCase() {
-    if (cameraProvider == null) {
-      return
+        val builder = Preview.Builder()
+        builder.setTargetResolution(targetResolution)
+        previewUseCase = builder.build()
+        previewUseCase!!.setSurfaceProvider(previewView!!.surfaceProvider)
+        cameraProvider!!.bindToLifecycle(/* lifecycleOwner= */ this,
+            cameraSelector!!,
+            previewUseCase
+        )
     }
-    if (analysisUseCase != null) {
-      cameraProvider!!.unbind(analysisUseCase)
+
+    private fun bindAnalysisUseCase() {
+        if (cameraProvider == null) {
+            return
+        }
+        if (analysisUseCase != null) {
+            cameraProvider!!.unbind(analysisUseCase)
+        }
+        if (imageProcessor != null) {
+            imageProcessor!!.stop()
+        }
+        imageProcessor =
+            try {
+                Log.i(TAG, "Using Custom Image Label rock_paper_scissors Detector Processor")
+                val localClassifier =
+                    LocalModel.Builder().setAssetFilePath("model_1.tflite").build()
+                val customImageLabelerOptions =
+                    CustomImageLabelerOptions.Builder(localClassifier).build()
+                LabelDetectorProcessor(this, customImageLabelerOptions, model!!)
+
+            } catch (e: Exception) {
+                Log.e(TAG, "Can not create image processor", e)
+                Toast.makeText(
+                    applicationContext,
+                    "Can not create image processor: " + e.localizedMessage,
+                    Toast.LENGTH_LONG
+                )
+                    .show()
+                return
+            }
+
+        val builder = ImageAnalysis.Builder()
+        builder.setTargetResolution(targetResolution)
+        analysisUseCase = builder.build()
+
+
+        analysisUseCase?.setAnalyzer(
+            // imageProcessor.processImageProxy will use another thread to run the detection underneath,
+            // thus we can just runs the analyzer itself on main thread.
+            ContextCompat.getMainExecutor(this),
+            ImageAnalysis.Analyzer { imageProxy: ImageProxy ->
+                try {
+                    imageProcessor!!.processImageProxy(imageProxy, graphicOverlay)
+                } catch (e: MlKitException) {
+                    Log.e(TAG, "Failed to process image. Error: " + e.localizedMessage)
+                    Toast.makeText(applicationContext, e.localizedMessage, Toast.LENGTH_SHORT)
+                        .show()
+                }
+            }
+        )
+        cameraProvider!!.bindToLifecycle(/* lifecycleOwner= */ this,
+            cameraSelector!!,
+            analysisUseCase
+        )
     }
-    if (imageProcessor != null) {
-      imageProcessor!!.stop()
+
+    companion object {
+        private const val TAG = "CameraXLivePreview"
     }
-    imageProcessor =
-      try {
-        Log.i(TAG, "Using Custom Image Label rock_paper_scissors Detector Processor")
-        val localClassifier =
-          LocalModel.Builder().setAssetFilePath("model_1.tflite").build()
-        val customImageLabelerOptions =
-          CustomImageLabelerOptions.Builder(localClassifier).build()
-        LabelDetectorProcessor(this, customImageLabelerOptions, model!!)
-
-      } catch (e: Exception) {
-        Log.e(TAG, "Can not create image processor", e)
-        Toast.makeText(
-            applicationContext,
-            "Can not create image processor: " + e.localizedMessage,
-            Toast.LENGTH_LONG
-          )
-          .show()
-        return
-      }
-
-    val builder = ImageAnalysis.Builder()
-    builder.setTargetResolution(targetResolution)
-    analysisUseCase = builder.build()
-
-
-    analysisUseCase?.setAnalyzer(
-      // imageProcessor.processImageProxy will use another thread to run the detection underneath,
-      // thus we can just runs the analyzer itself on main thread.
-      ContextCompat.getMainExecutor(this),
-      ImageAnalysis.Analyzer { imageProxy: ImageProxy ->
-        try {
-          imageProcessor!!.processImageProxy(imageProxy, graphicOverlay)
-        } catch (e: MlKitException) {
-          Log.e(TAG, "Failed to process image. Error: " + e.localizedMessage)
-          Toast.makeText(applicationContext, e.localizedMessage, Toast.LENGTH_SHORT).show()
-        }
-      }
-    )
-    cameraProvider!!.bindToLifecycle(/* lifecycleOwner= */ this, cameraSelector!!, analysisUseCase)
-  }
-
-  companion object {
-    private const val TAG = "CameraXLivePreview"
-  }
 }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXViewModel.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXViewModel.kt
index e08e9467..f5ba1f3d 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXViewModel.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/camera/CameraXViewModel.kt
@@ -16,19 +16,15 @@
 package ch.epfl.sweng.rps.ui.camera
 
 import android.app.Application
-import androidx.annotation.RequiresApi
-import android.os.Build.VERSION_CODES
 import android.util.Log
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.MutableLiveData
 import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.lifecycle.LiveData
-import ch.epfl.sweng.rps.ui.camera.CameraXViewModel
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import java.util.concurrent.ExecutionException
 
 /** View model for interacting with CameraX.  */
-@RequiresApi(VERSION_CODES.LOLLIPOP)
 class CameraXViewModel
 /**
  * Create an instance which interacts with the camera service via the given application context.
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/home/HomeFragment.kt
index 7f6cd5d1..303525df 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/home/HomeFragment.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.Navigation
 import androidx.navigation.fragment.findNavController
 import ch.epfl.sweng.rps.R
 import ch.epfl.sweng.rps.databinding.FragmentHomeBinding
@@ -61,8 +60,6 @@ class HomeFragment : Fragment() {
     }
 
     private fun setNavigationOnButton(buttonToBind: Button, fragmentID: Int) {
-        buttonToBind.setOnClickListener { view: View ->
-            Navigation.findNavController(view).navigate(fragmentID)
-        }
+        buttonToBind.setOnClickListener { findNavController().navigate(fragmentID) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
index 900884c2..553ef441 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/settings/SettingsActivity.kt
@@ -53,11 +53,10 @@ class SettingsActivity : AppCompatActivity(),
             }
         }
 
-        fun applyTheme(context: Context, sharedPreferences: SharedPreferences?) {
-            val prefs = sharedPreferences ?: PreferenceManager.getDefaultSharedPreferences(context)
+        fun applyTheme(context: Context, sharedPreferences: SharedPreferences? = null) {
             applyTheme(
                 context.getString(R.string.theme_pref_key),
-                prefs
+                sharedPreferences ?: PreferenceManager.getDefaultSharedPreferences(context)
             )
         }
     }

From ae05bfaec4be26d1234f0167267913dcbc6aaf81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <blaxoujunior@gmail.com>
Date: Thu, 26 May 2022 18:38:18 +0200
Subject: [PATCH 09/12] improve login in

---
 .../ch/epfl/sweng/rps/LoadingActivityTest.kt  |  5 ++-
 .../sweng/rps/auth/FirebaseAuthenticator.kt   | 39 ++++++++++---------
 .../main/java/ch/epfl/sweng/rps/utils/L.kt    | 13 +++++--
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
index 8a9d7351..d7335d26 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
@@ -6,6 +6,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.runBlocking
 import org.junit.Rule
 import org.junit.Test
 
@@ -32,7 +33,9 @@ class LoadingActivityTest {
     fun testNav() {
         rule.scenario.onActivity {
             onView(withId(R.id.loadingActivityProgressBar)).check(matches(isDisplayed()))
-            it.nav()
+            runBlocking {
+                it.nav()
+            }
         }
 
     }
diff --git a/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt b/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt
index 0471e45a..f49f05e9 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/auth/FirebaseAuthenticator.kt
@@ -4,15 +4,17 @@ import android.content.Intent
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.lifecycle.lifecycleScope
 import ch.epfl.sweng.rps.R
 import ch.epfl.sweng.rps.models.remote.User
 import ch.epfl.sweng.rps.services.ServiceLocator
+import ch.epfl.sweng.rps.utils.L
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
-import com.google.android.gms.common.api.ApiException
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.tasks.await
 
 class FirebaseAuthenticator private constructor(
     private val context: ComponentActivity,
@@ -24,27 +26,30 @@ class FirebaseAuthenticator private constructor(
     private val resultLauncher =
         context.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { res ->
             val data: Intent? = res.data
-            val task = GoogleSignIn.getSignedInAccountFromIntent(data)
             try {
-                val account = task.getResult(ApiException::class.java)!!
-                signInWithToken(account.idToken!!)
-            } catch (e: ApiException) {
-
+                val task = GoogleSignIn.getSignedInAccountFromIntent(data)
+                context.lifecycleScope.launch {
+                    val account = task.await()
+                    val userData = signInWithToken(account.idToken!!)
+                    callback(userData)
+                }
+            } catch (e: Exception) {
+                L.of(FirebaseAuthenticator::class.java).e("", e)
             }
         }
 
-    private fun signInWithToken(idToken: String) {
+    private suspend fun signInWithToken(idToken: String): User {
         val credential = GoogleAuthProvider.getCredential(idToken, null)
-        FirebaseAuth.getInstance().signInWithCredential(credential).addOnCompleteListener { res ->
-            val user = res.result.user!!
-            runBlocking {
-                val userData = createOrGetUser(user.uid, user.displayName, user.email)
-                callback(userData)
-            }
-        }
+        val res = FirebaseAuth.getInstance().signInWithCredential(credential).await()
+        val user = res.user!!
+        return createOrGetUser(user.uid, user.displayName, user.email)
     }
 
-    private suspend fun createOrGetUser(uid: String, displayName: String?, email: String?): User {
+    private suspend fun createOrGetUser(
+        uid: String,
+        displayName: String?,
+        email: String?
+    ): User {
         Log.d("DsName", displayName.orEmpty())
         var user = repo.getUser(uid)
         if (user == null) {
@@ -64,8 +69,6 @@ class FirebaseAuthenticator private constructor(
     }
 
     companion object {
-
-        private const val RC_SIGN_IN = 9001
         fun registerFor(
             context: ComponentActivity,
             callback: (User) -> Unit
diff --git a/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt b/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
index f585d6b1..a8c80faf 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/utils/L.kt
@@ -69,9 +69,14 @@ object L {
                 notifyListeners()
             }
 
-        fun log(message: String, level: Level = Level.INFO) {
+        fun log(message: String, level: Level = Level.INFO, throwable: Throwable? = null) {
             val e = LogEntry(name, message, Date(), level)
-            Log.println(e.level.priority, e.tag, e.message)
+            val msg = if (throwable != null) {
+                message + '\n' + Log.getStackTraceString(throwable)
+            } else {
+                message
+            }
+            Log.println(e.level.priority, e.tag, msg)
             logs.add(e)
             if (logs.size > logsSize) {
                 logs.removeFirst()
@@ -79,8 +84,8 @@ object L {
             notifyListeners()
         }
 
-        fun e(message: String) {
-            log(message, Level.ERROR)
+        fun e(message: String, throwable: Throwable? = null) {
+            log(message, Level.ERROR, throwable = throwable)
         }
 
         fun w(message: String) {

From e1d491457599bf4f60d00ed8c2af1f7694e9c17b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <blaxoujunior@gmail.com>
Date: Thu, 26 May 2022 19:22:12 +0200
Subject: [PATCH 10/12] fix tests

---
 .../java/ch/epfl/sweng/rps/models/remote/Round.kt  |  4 ----
 .../java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt | 14 +++++---------
 .../ch/epfl/sweng/rps/utils/ChangeNotifierTest.kt  |  4 +++-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sweng/rps/models/remote/Round.kt b/app/src/main/java/ch/epfl/sweng/rps/models/remote/Round.kt
index 70d1a30d..bdfb24a0 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/models/remote/Round.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/models/remote/Round.kt
@@ -118,10 +118,6 @@ sealed class Round {
                 acc
             }
             val all = rows + cols + listOf(diag, diag2)
-            println("Rows: $rows")
-            println("Cols: $cols")
-            println("Diag: $diag")
-            println("Diag2: $diag2")
             return all.firstNotNullOfOrNull { list ->
                 val first = list.first()
                 if (list.all { it == first }) {
diff --git a/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt b/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt
index 343374d6..b0412e3d 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/utils/ChangeNotifier.kt
@@ -40,7 +40,7 @@ open class ChangeNotifier<T> where  T : ChangeNotifier<T> {
 
     private fun ensureNotDisposed() {
         if (debugDisposed) {
-            throw Exception(
+            throw DisposedException(
                 "This ${this::class.java.simpleName} has been disposed and cannot be used anymore."
             )
         }
@@ -66,13 +66,9 @@ open class ChangeNotifier<T> where  T : ChangeNotifier<T> {
         }
     }
 
-    class ListenerException : Exception {
-        constructor(message: String?, cause: Throwable?) : super(message, cause)
-        constructor(message: String) : super(message)
-    }
+    class ListenerException(message: String?, cause: Throwable?) : Exception(message, cause)
 
-    class ListenerNotFoundException : Exception {
-        constructor(message: String?, cause: Throwable?) : super(message, cause)
-        constructor(message: String) : super(message)
-    }
+    class ListenerNotFoundException(message: String) : Exception(message)
+
+    class DisposedException(message: String) : Exception(message)
 }
diff --git a/app/src/test/java/ch/epfl/sweng/rps/utils/ChangeNotifierTest.kt b/app/src/test/java/ch/epfl/sweng/rps/utils/ChangeNotifierTest.kt
index 6782b977..a9890c00 100644
--- a/app/src/test/java/ch/epfl/sweng/rps/utils/ChangeNotifierTest.kt
+++ b/app/src/test/java/ch/epfl/sweng/rps/utils/ChangeNotifierTest.kt
@@ -83,7 +83,9 @@ class ChangeNotifierTest {
 
         notifier.dispose()
 
-        notifier.notifyListeners()
+        assertThrows<ChangeNotifier.DisposedException> {
+            notifier.notifyListeners()
+        }
 
         called.entries.forEach {
             assertEquals(1, it.value)

From d1de60a574aa514dfac4b616188815d2e51bc70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <blaxoujunior@gmail.com>
Date: Thu, 26 May 2022 20:51:11 +0200
Subject: [PATCH 11/12] fixed a few docs and merge

---
 .../java/ch/epfl/sweng/rps/CacheTests.kt      | 12 +--
 .../ch/epfl/sweng/rps/persistence/Cache.kt    | 87 ++++++++++++++++---
 2 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
index a08153d7..eb21bf97 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
@@ -60,8 +60,8 @@ class CacheTests {
     @Test
     fun cacheContainsNoDataWhenCreated() {
         assertNull(cache.getUserDetailsFromCache())
-        assertTrue(cache.getStatsDataFromCache(0).isEmpty())
-        assertTrue(cache.getLeaderBoardDataFromCache(0).isEmpty())
+        assertTrue(cache.getStatsDataFromCache().isEmpty())
+        assertTrue(cache.getLeaderBoardDataFromCache().isEmpty())
     }
 
     @Test
@@ -81,7 +81,7 @@ class CacheTests {
 
     @Test
     fun cacheCorrectlySavesStatsData() {
-        assertTrue(cache.getStatsDataFromCache(0).isEmpty())
+        assertTrue(cache.getStatsDataFromCache().isEmpty())
         val lst = listOf(
             UserStat(gameId = "1234", date = "14/07/2020", opponents = "Opp", "Best 5", "0"),
             UserStat(gameId = "1244", date = "14/07/1020", opponents = "Opp1", "Best 3", "0"),
@@ -89,13 +89,13 @@ class CacheTests {
         )
         cache.updateStatsData(lst)
         cache.clearLocalVars()
-        val result = cache.getStatsDataFromCache(0)
+        val result = cache.getStatsDataFromCache()
         assertEquals(result, lst)
     }
 
     @Test
     fun cacheCorrectlySavesLeaderBoardData() {
-        assertTrue(cache.getLeaderBoardDataFromCache(0).isEmpty())
+        assertTrue(cache.getLeaderBoardDataFromCache().isEmpty())
         val user1 =
             LeaderBoardInfo("jinglun", "1", Uri.parse("https://example.com/"), 100)
         val user2 =
@@ -105,7 +105,7 @@ class CacheTests {
         val allPlayers = listOf(user1, user2, user3)
         cache.updateLeaderBoardData(allPlayers)
         cache.clearLocalVars()
-        val result = cache.getLeaderBoardDataFromCache(0)
+        val result = cache.getLeaderBoardDataFromCache()
         assertEquals(result, allPlayers)
     }
 
diff --git a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
index 5d638328..c092d512 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/persistence/Cache.kt
@@ -14,7 +14,15 @@ import ch.epfl.sweng.rps.services.ServiceLocator
 import ch.epfl.sweng.rps.utils.L
 import ch.epfl.sweng.rps.utils.isInternetAvailable
 
-
+/**
+ * This class is to be used as the main reference for all data operations.
+ * The cache implements two methods for each data that you want to get:
+ * Async and non-async methods.
+ * Async methods are to be used when you specifically want up to date data, and
+ * non-async when you want whatever data is already available either in cache or local storage.
+ * Every method that fetches from a remote repository such as firebase always updates cache and
+ * local storage.
+ */
 class Cache private constructor(ctx: Context, val preferFresh: Boolean = false) {
     private val storage: Storage = PrivateStorage(ctx)
 
@@ -34,19 +42,22 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         leaderBoardData = null
     }
 
-
+    /**
+     * Returns the user data from the cache.
+     */
     fun getUserDetailsFromCache(): User? {
         if (user != null) return user
         user = storage.getUser()
         return user
     }
 
-    val log = L.of("RPSCache")
+    private val log = L.of("RPSCache")
 
+    /**
+     * This function returns the details of the user from the cache or from the remote repository.
+     */
     suspend fun getUserDetails(): User? {
-        val uid = repo.rawCurrentUid()
-
-        if (uid == null) return getUserDetailsFromCache()
+        val uid = repo.rawCurrentUid() ?: return getUserDetailsFromCache()
 
         if (user != null && user!!.uid == uid) return user
         repo.getUser(uid)?.apply {
@@ -57,6 +68,11 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return user
     }
 
+    /**
+     * This functions updates both user stored in the local storage and in firebase
+     * with the data passed as parameter, see parameters for more details.
+     * @param user The user to be updated
+     */
     fun setUserDetails(user: User?) {
         if (user == null) {
             this.user = null
@@ -67,17 +83,29 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         storage.writeBackUser(user)
     }
 
-
+    /**
+     * Updates the stats data in both firebase and local storage.
+     * @param statsData The stats data to be updated
+     */
     fun updateStatsData(statsData: List<UserStat>) {
         userStatData = statsData
         storage.writeBackStatsData(statsData)
     }
 
 
+    /**
+     * Returns the user picture of the current user from either cache or local storage.
+     * @return The user picture gotten from storage/cache.
+     */
     fun getUserPicture(): Bitmap? {
         return userPicture ?: storage.getUserPicture()
     }
 
+    /**
+     * Returns the user picture from firebase if available and automatically updates cache and
+     * storage.
+     * @return The user picture gotten from Firebase.
+     */
     suspend fun getUserPictureAsync(): Bitmap? {
         if (!isInternetAvailable()) {
             return getUserPicture()
@@ -90,22 +118,35 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return userPicture
     }
 
+    /**
+     * Updates the user picture in firebase, cache and local storage.
+     * @param bitmap The new user picture
+     */
     suspend fun updateUserPicture(bitmap: Bitmap) {
         userPicture = bitmap
         repo.setUserProfilePicture(bitmap)
         storage.writeBackUserPicture(bitmap)
     }
 
-    fun getStatsDataFromCache(position: Int): List<UserStat> {
+    /**
+     * Retrieves the stats data from cache or local storage.
+     * @return the stats data for the user.
+     */
+    fun getStatsDataFromCache(): List<UserStat> {
         if (userStatData != null) return userStatData!!
         userStatData = storage.getStatsData() ?: listOf()
         return userStatData!!
     }
 
+    /**
+     * Retrieves the stats data from cache or local storage.
+     * @param position the position of the stats.
+     * @return the stats data for the user.
+     */
     suspend fun getStatsData(position: Int): List<UserStat> {
         if (!isInternetAvailable()) {
             log.d("INTERNET NOT AVAILABLE")
-            return getStatsDataFromCache(position)
+            return getStatsDataFromCache()
         }
         userStatData = FirebaseHelper.getStatsData(position)
         log.d(userStatData!!.size.toString())
@@ -113,21 +154,36 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return userStatData!!
     }
 
+    /**
+     * MAINLY FOR TESTING
+     * Updates the leaderboard data in cache and localStorage
+     * @param lBData the new leaderboard data
+     */
     fun updateLeaderBoardData(lBData: List<LeaderBoardInfo>) {
         leaderBoardData = lBData
         storage.writeBackLeaderBoardData(lBData)
     }
 
-    fun getLeaderBoardDataFromCache(position: Int): List<LeaderBoardInfo> {
+    /**
+     * Gets leaderboard data from cache or local storage
+     * @param position the position of the leaderboard to load.
+     * @return A list of LeaderBoardInfo fetched from local storage or cache.
+     */
+    fun getLeaderBoardDataFromCache(): List<LeaderBoardInfo> {
         if (leaderBoardData != null) return leaderBoardData!!
         leaderBoardData = storage.getLeaderBoardData() ?: listOf()
         return leaderBoardData!!
     }
 
+    /**
+     * Gets leaderboard data firebase.
+     * @param position the position of the leaderboard to load.
+     * @return A list of LeaderBoardInfo fetched from firebase.
+     */
     suspend fun getLeaderBoardData(position: Int): List<LeaderBoardInfo> {
         if (!isInternetAvailable()) {
             log.d("INTERNET NOT AVAILABLE")
-            return getLeaderBoardDataFromCache(position)
+            return getLeaderBoardDataFromCache()
         }
         leaderBoardData = FirebaseHelper.getLeaderBoard(position)
         log.d(leaderBoardData!!.size.toString())
@@ -135,6 +191,9 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
         return leaderBoardData!!
     }
 
+    /**
+     * Clears the cache and local storage.
+     */
     fun clear() {
         clearLocalVars()
         for (file in Storage.FILES.values()) {
@@ -145,6 +204,9 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
     companion object {
         lateinit var cache: Cache
 
+        /**
+         * Returns the instance of the cache.
+         */
         fun getInstance(): Cache {
             if (!::cache.isInitialized) {
                 throw IllegalStateException("Cache not initialized")
@@ -152,6 +214,9 @@ class Cache private constructor(ctx: Context, val preferFresh: Boolean = false)
             return cache
         }
 
+        /**
+         * Initializes the cache. It needs a context to initialize the storage.
+         */
         fun initialize(ctx: Context): Cache {
             cache = Cache(ctx.applicationContext, true)
             return cache

From d7331f35510f25fb0107635aee88d87644702839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20S?= <blaxoujunior@gmail.com>
Date: Thu, 26 May 2022 22:32:20 +0200
Subject: [PATCH 12/12] remove faulty test for now

---
 .../java/ch/epfl/sweng/rps/LoadingActivityTest.kt     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
index d7335d26..8cad0418 100644
--- a/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/LoadingActivityTest.kt
@@ -28,15 +28,4 @@ class LoadingActivityTest {
     fun start() {
         onView(withId(R.id.loadingActivityProgressBar)).check(matches(isDisplayed()))
     }
-
-    @Test
-    fun testNav() {
-        rule.scenario.onActivity {
-            onView(withId(R.id.loadingActivityProgressBar)).check(matches(isDisplayed()))
-            runBlocking {
-                it.nav()
-            }
-        }
-
-    }
 }
\ No newline at end of file