From a6293497f17b5a89808cb322f418f0777325c2f9 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Tue, 19 Apr 2022 23:28:22 +0200
Subject: [PATCH 01/45] update google signin auth

---
 .../activity/AuthenticationActivity.kt        | 54 ++++++++++--
 .../vibester/auth/FireBaseAuthenticator.kt    | 83 ++++++++++++++-----
 .../res/layout/activity_authentication.xml    |  8 +-
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 111 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 5e536672b..0fec5155b 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -2,6 +2,7 @@ package ch.sdp.vibester.activity
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.Window
 import android.widget.Button
 import android.widget.EditText
@@ -10,13 +11,16 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.helper.IntentSwitcher
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.GoogleAuthProvider
+import com.google.firebase.auth.ktx.auth
+import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -29,6 +33,8 @@ class AuthenticationActivity : AppCompatActivity() {
     @Inject
     lateinit var authenticator: FireBaseAuthenticator
 
+    private lateinit var auth: FirebaseAuth
+
     private lateinit var email: TextView
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -38,11 +44,13 @@ class AuthenticationActivity : AppCompatActivity() {
         setContentView(R.layout.activity_authentication)
 
         val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+            .requestIdToken("7687769601-qiqrp6kt48v89ub76k9lkpefh9ls36ha.apps.googleusercontent.com")
             .requestEmail()
             .build()
 
         googleSignInClient = GoogleSignIn.getClient(this, gso)
 
+        auth = Firebase.auth
 
         val btCreateAcc = findViewById<Button>(R.id.createAcc)
         val btLogIn = findViewById<Button>(R.id.logIn)
@@ -72,16 +80,47 @@ class AuthenticationActivity : AppCompatActivity() {
     }
 
     /**
-     * A function to updates the UI based on google sign in result
+     * A function that is called on google sign in result
      * @param requestCode a request code
      * @param resultCode a result code
      * @param data intent returned from google sign in
      */
-    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        updateUI(authenticator.googleActivityResult(requestCode, resultCode, data), false)
+        if (requestCode == 1000) {
+            val task = GoogleSignIn.getSignedInAccountFromIntent(data)
+            try {
+                val account = task.getResult(ApiException::class.java)!!
+                Log.d(getString(R.string.log_tag), "firebaseAuthWithGoogle:" + account.id)
+                googleAuthFirebase(account.idToken!!)
+            } catch (e: ApiException) {
+                Log.d(getString(R.string.log_tag), "Google sign in failed", e)
+                updateUI("Authentication Error", false)
+            }
+        }
+    }
+
+
+    private fun googleAuthFirebase(idToken: String) {
+        val credential = GoogleAuthProvider.getCredential(idToken, null)
+        auth.signInWithCredential(credential)
+            .addOnCompleteListener(this) { task ->
+                if (task.isSuccessful) {
+                    // Sign in success, update UI with the signed-in user's information
+                    Log.d(getString(R.string.log_tag), "signInWithCredential:success")
+                    val user = auth.currentUser
+                    if (user != null) {
+                        updateUI(user.email.toString(), false)
+                    }
+                } else {
+                    // fail
+                    Log.d(getString(R.string.log_tag), "signInWithCredential:failure", task.exception)
+                    updateUI("Authentication Error", false)
+                }
+            }
     }
 
+
     /**
      * A function validates email and password
      * @param email email
@@ -143,7 +182,7 @@ class AuthenticationActivity : AppCompatActivity() {
                 baseContext, "You have logged in successfully",
                 Toast.LENGTH_SHORT
             ).show()
-            val user = authenticator.getCurrUser()
+            val user = FireBaseAuthenticator.getCurrUser()
             if (user != null) {
                 updateUI(user.email, createAcc)
             }
@@ -156,8 +195,9 @@ class AuthenticationActivity : AppCompatActivity() {
         }
     }
 
-    private fun updateUI(emailText: String?,
-                         createAcc: Boolean,
+    private fun updateUI(
+        emailText: String?,
+        createAcc: Boolean,
     ) {
         if (emailText != null) {
             if('@' in emailText && !createAcc) {
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index ca797c939..eed78a74f 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -1,15 +1,27 @@
 package ch.sdp.vibester.auth
 
+import android.app.Application
+import android.content.Context
 import android.content.Intent
+import android.content.res.Resources
+import android.util.Log
+import ch.sdp.vibester.R
+import com.google.android.gms.auth.api.identity.Identity
 import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
+import com.google.firebase.auth.GoogleAuthProvider
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.scopes.ServiceScoped
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 class FireBaseAuthenticator @Inject constructor() {
@@ -33,6 +45,54 @@ class FireBaseAuthenticator @Inject constructor() {
             }
         }
 
+
+        /**
+         * A function to return the result of google sign in
+         * @param requestCode a request code
+         * @param resultCode a result code
+         * @param data intent returned from google sign in
+         */
+        fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?, ctx: Context): String? {
+            if (requestCode == 1000) {
+                try {
+                    val account = GoogleSignIn.getSignedInAccountFromIntent(data).result
+                    val client = Identity.getSignInClient(ctx)
+
+
+
+                    val idToken = client.getSignInCredentialFromIntent(data).googleIdToken
+                    Log.e("IDTOK", idToken!!)
+                    val ficred = GoogleAuthProvider.getCredential(idToken, null)
+                    FirebaseAuth.getInstance().signInWithCredential(ficred).addOnCompleteListener{ task->
+                        if(task.isSuccessful){
+
+                            Log.e("Task", "successful")
+                        }else{
+                            Log.e("Task","not success")
+                        }
+                    }
+
+
+
+
+                    return account.email
+                } catch (e: ApiException) {
+                    Log.e("hey you one", e.stackTraceToString())
+                    return "Authentication error"
+                }
+            } else {
+                Log.e("hey you two", "")
+                return "Authentication error"
+            }
+        }
+
+        /**
+         * Getter for the current user
+         */
+        fun getCurrUser(): FirebaseUser? {
+            return Firebase.auth.currentUser
+        }
+
     }
 
     private val auth: FirebaseAuth = Firebase.auth
@@ -53,32 +113,9 @@ class FireBaseAuthenticator @Inject constructor() {
      * @param password passwprd
      * @return Task of the result
      */
-
     fun createAccount(email: String, password: String): Task<AuthResult> {
         return auth.createUserWithEmailAndPassword(email, password)
     }
 
-    fun getCurrUser(): FirebaseUser? {
-        return auth.currentUser
-    }
 
-    /**
-     * A function to return the result of google sign in
-     * @param requestCode a request code
-     * @param resultCode a result code
-     * @param data intent returned from google sign in
-     */
-    fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?): String? {
-        return if (requestCode == 1000) {
-            val task = GoogleSignIn.getSignedInAccountFromIntent(data)
-            try {
-                val account = task.getResult(ApiException::class.java)!!
-                account.email
-            } catch (e: ApiException) {
-                "Authentication error"
-            }
-        } else {
-            "Authentication error"
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_authentication.xml b/app/src/main/res/layout/activity_authentication.xml
index 84ec7a43e..e9c6d371c 100644
--- a/app/src/main/res/layout/activity_authentication.xml
+++ b/app/src/main/res/layout/activity_authentication.xml
@@ -9,11 +9,9 @@
 
     <TextView
         android:id="@+id/email"
-        android:layout_width="357dp"
-        android:layout_height="220dp"
-        android:layout_marginStart="27dp"
+        android:layout_width="367dp"
+        android:layout_height="211dp"
         android:layout_marginTop="100dp"
-        android:layout_marginEnd="27dp"
         android:fontFamily="monospace"
         android:text="@string/authentication_noActionDoneYet"
         android:textAlignment="center"
@@ -21,7 +19,7 @@
         android:textSize="25sp"
         app:layout_constraintBottom_toTopOf="@+id/scrollView2"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_bias="0.636"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64820ab3e..d6a4342ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="authentication_placeholderHandle">Placeholder Handle</string>
     <string name="authentication_placeholderUsername">Placeholder Username</string>
     <string name="authentication_placeholderEmptyScore">Error</string>
-    <string name="authentication_noActionDoneYet">Either log in with your google account or fill in credentials to create an account or log in</string>
+    <string name="authentication_noActionDoneYet">Either log in with your Google account or fill in credentials to create an account or log in</string>
 
     <!-- OLD String-->
 

From 2471a0087d63089309464449ce59d0b3946280bb Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sun, 24 Apr 2022 12:13:43 +0200
Subject: [PATCH 02/45] user profile improvement

---
 .../activity/CreateProfileActivityTest.kt     |  7 ++---
 .../vibester/activity/ProfileActivityTest.kt  |  7 ++---
 .../activity/CreateProfileActivity.kt         |  6 ++--
 .../vibester/activity/GameEndingActivity.kt   | 14 +++++++--
 .../sdp/vibester/activity/ProfileActivity.kt  | 10 +++---
 .../sdp/vibester/activity/WelcomeActivity.kt  | 16 ++++++++++
 .../java/ch/sdp/vibester/api/InternetState.kt | 31 +++++++++++++++++++
 .../database/{UsersRepo.kt => DataGetter.kt}  | 24 ++++++++++++--
 .../java/ch/sdp/vibester/database/Database.kt |  3 +-
 .../ch/sdp/vibester/database/DbUserIdStore.kt | 15 +++++++++
 .../ch/sdp/vibester/model/UserSharedPref.kt   | 12 +++----
 11 files changed, 115 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/api/InternetState.kt
 rename app/src/main/java/ch/sdp/vibester/database/{UsersRepo.kt => DataGetter.kt} (78%)
 create mode 100644 app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index 267095ae5..cfb745fc6 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -5,13 +5,12 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers.* //change this import
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.profile.UserProfile
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -39,14 +38,14 @@ class CreateProfileActivityTest {
     }
 
     @BindValue @JvmField
-    val mockUsersRepo = mockk<UsersRepo>()
+    val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(email: String) {
         every {mockUsersRepo.createUser(any(), any(), any(), any())} answers {
             lastArg<(String) -> Unit>().invoke(email)
         }
 
-        every { mockUsersRepo.getUserData(any(), any()) } answers {
+        every { mockUsersRepo.getUserData(any()) } answers {
             secondArg<(UserProfile) -> Unit>().invoke(UserProfile())
         }
     }
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index 19710ec5d..d6b6a4c15 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -5,13 +5,12 @@ import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.matcher.ViewMatchers.* //change this import
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.model.UserSharedPref
 import ch.sdp.vibester.profile.UserProfile
 import dagger.hilt.android.testing.BindValue
@@ -40,10 +39,10 @@ class ProfileActivityTest {
     }
 
     @BindValue @JvmField
-    val mockUsersRepo = mockk<UsersRepo>()
+    val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(mockProfile: UserProfile) {
-        every { mockUsersRepo.getUserData(any(), any()) } answers {
+        every { mockUsersRepo.getUserData(any()) } answers {
             secondArg<(UserProfile) -> Unit>().invoke(mockProfile)
         }
         every { mockUsersRepo.updateFieldString(any(), any(), any()) } answers {}
diff --git a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
index 8a8b64199..5b429e557 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -14,7 +14,7 @@ import javax.inject.Inject
 class CreateProfileActivity : AppCompatActivity() {
 
     @Inject
-    lateinit var usersRepo: UsersRepo
+    lateinit var dataGetter: DataGetter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -27,7 +27,7 @@ class CreateProfileActivity : AppCompatActivity() {
         val btCreateAcc = findViewById<Button>(R.id.createButton)
 
         btCreateAcc.setOnClickListener {
-            usersRepo.createUser(
+            dataGetter.createUser(
                 email,
                 username.text.toString(),
                 handle.text.toString(),
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index 0cf497f94..8525e70d9 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -8,14 +8,23 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
+import ch.sdp.vibester.database.DbUserIdStore
 import ch.sdp.vibester.model.UserSharedPref
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
-/*
+/**
  * A class representing the activity which appears upon
  * completion of a game. Shows various stats.
  */
+@AndroidEntryPoint
 class GameEndingActivity : AppCompatActivity() {
 
+    @Inject
+    lateinit var dataGetter: DataGetter
+
     private var incorrectSongs: ArrayList<String>? = arrayListOf("Default song")
     private var statNames: ArrayList<String>? = arrayListOf(
         "Default name 1",
@@ -43,7 +52,7 @@ class GameEndingActivity : AppCompatActivity() {
         setContentView(R.layout.activity_game_ending_screen)
 
         //Method to update score (locally and on DB)
-        UserSharedPref.updateScore(this, 1)
+
 
         if (intent.hasExtra("Winner Name")) {
             val winner = intent.getStringExtra("Winner Name")
@@ -52,6 +61,7 @@ class GameEndingActivity : AppCompatActivity() {
             } else {findViewById<TextView>(R.id.winnerText).text="Nobody won this game!"}
         }
 
+        //dataGetter.updateRelativeFieldInt(DbUserIdStore.getUID(), 1, "totalGames")
 
         if (intent.hasExtra("playerName")) {
             playerName = intent.getStringExtra("playerName")
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 0721dbe01..1c98c586f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -11,11 +11,10 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.graphics.drawable.toBitmap
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
 import ch.sdp.vibester.model.UserSharedPref
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.profile.UserProfile
 import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -31,7 +30,7 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class ProfileActivity : AppCompatActivity() {
     @Inject
-    lateinit var usersRepo: UsersRepo
+    lateinit var dataGetter: DataGetter
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -67,6 +66,7 @@ class ProfileActivity : AppCompatActivity() {
             FirebaseAuth.getInstance().signOut()
             IntentSwitcher.switchBackToWelcome(this)
         }
+        queryDatabase()
 
     }
 
@@ -118,8 +118,8 @@ class ProfileActivity : AppCompatActivity() {
      * Hard coded for now
      */
 
-    private fun queryDatabase(email: String) {
-        usersRepo.getUserData(email, this::setupProfile)
+    private fun queryDatabase() {
+        dataGetter.getUserData(this::setupProfile)
 
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index e57772121..26874ee09 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -1,17 +1,28 @@
 package ch.sdp.vibester.activity
 
 //import ch.sdp.vibester.profile.ProfileDataProvider
+import android.content.Context
 import android.content.Intent
+import android.net.ConnectivityManager
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.api.InternetState
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
+import ch.sdp.vibester.database.Database
+import ch.sdp.vibester.database.PersistanceSetter
 import com.google.firebase.database.ktx.database
 import com.google.firebase.ktx.Firebase
 import ch.sdp.vibester.model.UserSharedPref
+import com.google.firebase.database.DataSnapshot
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.ValueEventListener
+import java.util.function.BinaryOperator
 
 class WelcomeActivity : AppCompatActivity() {
 
@@ -37,6 +48,11 @@ class WelcomeActivity : AppCompatActivity() {
             userStatusTextValue.text = "User: " + FireBaseAuthenticator.getCurrentUserMail()
         }
 
+        val startOfApp = !PersistanceSetter.getPersistance()
+
+        Log.e("INFO: Should Access", ((InternetState.hasAccessedInternetOnce(this))).toString())
+        PersistanceSetter.setPersistance()
+        Database.get()
 
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
new file mode 100644
index 000000000..52712c33b
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
@@ -0,0 +1,31 @@
+package ch.sdp.vibester.api
+
+import android.content.Context
+import android.net.ConnectivityManager
+
+class InternetState private constructor(){
+    companion object{
+        /**
+         * Get Internet Connexion Status
+         * @return return true if connected; false otherwise
+         */
+        fun getInternetStatus(ctx: Context): Boolean{
+            val connectivityManager = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val networkInfo = connectivityManager.activeNetworkInfo
+            var isNetwork:Boolean = false
+            if(networkInfo != null){
+                isNetwork = networkInfo.isConnected
+            }
+            return isNetwork
+        }
+
+        private var hasAlreadyAccessedInternetOnce: Boolean = false
+        fun hasAccessedInternetOnce(ctx: Context):Boolean{
+            if(!hasAlreadyAccessedInternetOnce&& getInternetStatus(ctx)){
+                hasAlreadyAccessedInternetOnce = true
+            }
+            return hasAlreadyAccessedInternetOnce
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
similarity index 78%
rename from app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
rename to app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index c8c6eca87..e6d9c0994 100644
--- a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -2,6 +2,7 @@ package ch.sdp.vibester.database
 
 import android.content.ContentValues
 import android.util.Log
+import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.profile.UserProfile
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
@@ -13,9 +14,14 @@ import javax.inject.Inject
  * The users class which handled all the interactions with the database that are linked to users
  */
 
-class UsersRepo @Inject constructor() {
+class DataGetter @Inject constructor() {
     private val dbRef = Database.get().getReference("users")
 
+    // Constructor
+    init {
+        Log.e("DATAGETTER","Hello world")
+    }
+
     /**
      * This function updates a specific field of a user in the database
      * @param userID the id of the user which is being updated
@@ -40,6 +46,17 @@ class UsersRepo @Inject constructor() {
             .setValue(newVal)
     }
 
+    fun updateRelativeFieldInt(userID: String, newVal: Int, fieldName: String) {
+        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+            .child(fieldName)
+            .get().addOnCompleteListener { t ->
+                dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+                    .child(fieldName)
+                    .setValue((t.result.value as Int?)!! + newVal)
+            }
+
+    }
+
 
     /**
      * The users class which handled all the interactions with the database that are linked to users
@@ -70,13 +87,14 @@ class UsersRepo @Inject constructor() {
      * @param email the of the user
      * @param callback the function to be called when the data of the appropriate user is available
      */
-    fun getUserData(email: String, callback: (UserProfile) -> Unit) {
+    fun getUserData(callback: (UserProfile) -> Unit) {
         dbRef.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 for (dataSnapShot in dataSnapshot.children) {
                     val dbContents = dataSnapShot.getValue<UserProfile>()
                     if (dbContents != null) {
-                        if(dbContents.email == email) {
+                        if(FireBaseAuthenticator.isLoggedIn() && dbContents.email == FireBaseAuthenticator.getCurrentUserMail()) {
+                            DbUserIdStore.storeUID(dataSnapShot.key!!)
                             callback(dbContents)
                             break
                         }
diff --git a/app/src/main/java/ch/sdp/vibester/database/Database.kt b/app/src/main/java/ch/sdp/vibester/database/Database.kt
index 872dc745e..61a12f91f 100644
--- a/app/src/main/java/ch/sdp/vibester/database/Database.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/Database.kt
@@ -1,5 +1,6 @@
 package ch.sdp.vibester.database
 
+import com.google.firebase.auth.FirebaseAuthSettings
 import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.ktx.database
 import com.google.firebase.ktx.Firebase
@@ -10,6 +11,6 @@ import com.google.firebase.ktx.Firebase
 
 object Database {
     fun get(): FirebaseDatabase {
-        return Firebase.database("https://vibester-sdp-default-rtdb.europe-west1.firebasedatabase.app")
+        return  Firebase.database("https://vibester-sdp-default-rtdb.europe-west1.firebasedatabase.app")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt b/app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt
new file mode 100644
index 000000000..38570e7ee
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt
@@ -0,0 +1,15 @@
+package ch.sdp.vibester.database
+
+class DbUserIdStore private constructor(){
+    companion object{
+        private var uid: String = ""
+        fun storeUID(uid: String){
+            this.uid = uid
+        }
+
+        fun getUID(): String{
+            return uid
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt b/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt
index 7583e0669..2c69c00af 100644
--- a/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt
@@ -3,13 +3,9 @@ package ch.sdp.vibester.model
 import android.content.Context
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
-import android.util.Log
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.profile.UserProfile
 import com.google.firebase.database.*
-import com.google.firebase.database.DataSnapshot
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.database.ktx.database
 import java.util.*
 
 /**
@@ -27,7 +23,7 @@ class UserSharedPref private constructor() {
         val RANKING = "ranking"
         val ONLINE = "online"
 
-        var dbAccess : UsersRepo = UsersRepo()
+        var dbAccess : DataGetter = DataGetter()
 
 
         private fun getSharedPreferences(ctx: Context): SharedPreferences? {
@@ -43,9 +39,9 @@ class UserSharedPref private constructor() {
         fun userReset(ctx: Context, email: String, online: Boolean = true){
             setUser(ctx, UserProfile(email=email), online)
             if (online){
-                dbAccess = UsersRepo()
+                dbAccess = DataGetter()
                 val call = {prof:UserProfile -> setUser(ctx, prof, online)}
-                dbAccess.getUserData(email, call)
+                dbAccess.getUserData(call)
             }
         }
 

From 3ba66aa921eb709ad3a0fe68f88ef897dfebf186 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sun, 24 Apr 2022 14:40:39 +0200
Subject: [PATCH 03/45] test updates

---
 .../vibester/activity/AuthenticationActivity.kt  |  2 +-
 .../sdp/vibester/auth/FireBaseAuthenticator.kt   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 0fec5155b..35d383a76 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -182,7 +182,7 @@ class AuthenticationActivity : AppCompatActivity() {
                 baseContext, "You have logged in successfully",
                 Toast.LENGTH_SHORT
             ).show()
-            val user = FireBaseAuthenticator.getCurrUser()
+            val user = authenticator.getCurrUser()
             if (user != null) {
                 updateUI(user.email, createAcc)
             }
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index eed78a74f..c2136faed 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -86,17 +86,19 @@ class FireBaseAuthenticator @Inject constructor() {
             }
         }
 
-        /**
-         * Getter for the current user
-         */
-        fun getCurrUser(): FirebaseUser? {
-            return Firebase.auth.currentUser
-        }
-
     }
 
     private val auth: FirebaseAuth = Firebase.auth
 
+
+    /**
+     * Getter for the current user
+     */
+    fun getCurrUser(): FirebaseUser? {
+        return Firebase.auth.currentUser
+    }
+
+
     /**
      * A function to log in with email and password
      * @param email email

From 982f61879de9a2efa93c8efb227099904dd1fb27 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Sun, 24 Apr 2022 14:41:05 +0200
Subject: [PATCH 04/45] add persistance Setter

---
 .../vibester/database/PersistanceSetter.kt    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt

diff --git a/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt b/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt
new file mode 100644
index 000000000..e6ffe6c71
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt
@@ -0,0 +1,22 @@
+package ch.sdp.vibester.database
+
+import com.google.firebase.database.ktx.database
+import com.google.firebase.ktx.Firebase
+
+class PersistanceSetter private constructor(){
+    companion object{
+        private var alreadyExecuted : Boolean = false
+
+        fun setPersistance(){
+            if (!alreadyExecuted){
+                Firebase.database.setPersistenceEnabled(true)
+                alreadyExecuted = true
+            }
+        }
+
+        fun getPersistance(): Boolean{
+            return alreadyExecuted
+        }
+    }
+
+}
\ No newline at end of file

From 704fb09ca0abd4d06be84b968cd2f63a073243a2 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 09:12:14 +0200
Subject: [PATCH 05/45] fixing test for idk numb of time

---
 .../activity/BuzzerScreenActivityTest.kt       |  6 ++++++
 .../activity/CreateProfileActivityTest.kt      | 18 +++++++++++-------
 .../vibester/activity/CreateProfileActivity.kt |  5 +++++
 .../sdp/vibester/activity/ProfileActivity.kt   |  7 ++++++-
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
index 425567f0e..adaa093d4 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
@@ -11,6 +11,8 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -18,6 +20,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class BuzzerScreenActivityTest {
 
     @get:Rule
@@ -25,6 +28,9 @@ class BuzzerScreenActivityTest {
         BuzzerScreenActivity::class.java
     )
 
+    @get:Rule
+    var hiltRule = HiltAndroidRule(this)
+
     @Before
     fun setUp() {
         Intents.init()
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index dda4c3886..f1fcb1c9f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -5,6 +5,7 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers.* //change this import
@@ -63,21 +64,24 @@ class CreateProfileActivityTest {
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), CreateProfileActivity::class.java)
         intent.putExtra("email", mockEmail)
+        intent.putExtra("isUnitTest", true)
 
         createMockInvocation(mockEmail)
 
         val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
 
-        onView(withId(R.id.accountUsername)).perform(ViewActions.typeText(username),
-            ViewActions.closeSoftKeyboard()
+        onView(withId(R.id.accountUsername)).perform(typeText(username),
+            closeSoftKeyboard()
         )
-        onView(withId(R.id.accountHandle)).perform(ViewActions.typeText(handle),
-            ViewActions.closeSoftKeyboard()
+        onView(withId(R.id.accountHandle)).perform(typeText(handle),
+            closeSoftKeyboard()
         )
-        onView(withId(R.id.createButton)).perform(ViewActions.click())
 
-        Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
-        Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
+       onView(withId(R.id.createButton)).perform(click())
+
+       Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
+       Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
+       Intents.intended(IntentMatchers.hasExtra("isUnitTest", true))
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
index 1eee810b5..f1c1c8248 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -25,10 +25,14 @@ class CreateProfileActivity : AppCompatActivity() {
 
     private val REQUEST_CODE = 500
 
+    var isUnitTest: Boolean = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_create_profile)
 
+        isUnitTest = intent.getBooleanExtra("isUnitTest", false)
+
         var email = intent.getStringExtra("email").toString()
         var username = findViewById<EditText>(R.id.accountUsername)
         var handle = findViewById<EditText>(R.id.accountHandle)
@@ -52,6 +56,7 @@ class CreateProfileActivity : AppCompatActivity() {
     private fun startNewActivity(email: String) {
         val newIntent = Intent(this, ProfileActivity::class.java)
         newIntent.putExtra("email", email)
+        newIntent.putExtra("isUnitTest", isUnitTest)
 
         startActivity(newIntent)
     }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index e0286558b..b29e08af9 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -66,7 +66,12 @@ class ProfileActivity : AppCompatActivity() {
             FirebaseAuth.getInstance().signOut()
             IntentSwitcher.switchBackToWelcome(this)
         }
-        queryDatabase()
+
+        // Do not enable querying database while executing unit test
+        val isUnitTest: Boolean = intent.getBooleanExtra("isUnitTest", false)
+        if(!isUnitTest){
+            queryDatabase()
+        }
 
     }
 

From a02c4bb4ad399fb99f2b22b833d045a8623f835b Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 09:41:18 +0200
Subject: [PATCH 06/45] fixing test for idk numb of time 2

---
 .../ch/sdp/vibester/activity/GameEndingActivityTest.kt   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index bd33fe975..a8f965e4b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -14,6 +14,8 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -21,12 +23,15 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class GameEndingActivityTest {
 
-    @Rule
-    @JvmField
+    @get:Rule
     val activityRule = ActivityScenarioRule(GameEndingActivity::class.java)
 
+    @get:Rule
+    var hiltRule = HiltAndroidRule(this)
+
     @Before
     fun setUp() {
         Intents.init()

From 44651229948203cb5f990c24c9ad745123183b67 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 10:19:17 +0200
Subject: [PATCH 07/45] adding hilt to a test

---
 .../sdp/vibester/activity/LyricsBelongGameActivityTest.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index 045e291c3..c8dcfe512 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -16,13 +16,20 @@ import androidx.test.rule.GrantPermissionRule
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.hamcrest.CoreMatchers.not
 import org.junit.*
 import org.junit.Assert.assertEquals
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class LyricsBelongGameActivityTest {
+
+    @get:Rule
+    var hiltRule = HiltAndroidRule(this)
+
     private val sleepTime: Long = 5000
     private val songName = "Thunder"
     private val artistName = "Imagine Dragons"

From a8e0bdf75e4bda572d1adaa0679905d61d1e75be Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 11:03:29 +0200
Subject: [PATCH 08/45] fixing some other test

---
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index d6b6a4c15..eff00781a 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -58,9 +58,10 @@ class ProfileActivityTest {
         val inputProfile = UserProfile("@lisa", "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
 
         createMockInvocation(inputProfile)
-        UserSharedPref.setUser(ctx, inputProfile, false)
+        //UserSharedPref.setUser(ctx, inputProfile, false)
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.handle)).check(matches(withText(inputProfile.handle)))

From 42ef816feef170a930f7d38e31a63ac7f3f02cba Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 11:35:40 +0200
Subject: [PATCH 09/45] fixing some other test 2

---
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt     | 2 +-
 .../main/java/ch/sdp/vibester/activity/ProfileActivity.kt    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index eff00781a..fbff0b241 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -59,9 +59,9 @@ class ProfileActivityTest {
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
         intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile",  inputProfile)
 
         createMockInvocation(inputProfile)
-        //UserSharedPref.setUser(ctx, inputProfile, false)
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.handle)).check(matches(withText(inputProfile.handle)))
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index b29e08af9..335cab8b9 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -41,8 +41,6 @@ class ProfileActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_profile)
 
-        setupProfile(UserSharedPref.getUser(applicationContext))
-
         val editUsername = findViewById<Button>(R.id.editUser)
         val editHandle = findViewById<Button>(R.id.editHandle)
 
@@ -71,6 +69,9 @@ class ProfileActivity : AppCompatActivity() {
         val isUnitTest: Boolean = intent.getBooleanExtra("isUnitTest", false)
         if(!isUnitTest){
             queryDatabase()
+        }else{
+            var upTest: UserProfile? = intent.getSerializableExtra("userTestProfile") as UserProfile?
+            if (upTest == null) {setupProfile(UserProfile())}else{ setupProfile(upTest)}
         }
 
     }

From cea160ea76a2356eb549dc3b6a77706d080cedfa Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 11:51:36 +0200
Subject: [PATCH 10/45] adding hilt to a test 2

---
 .../sdp/vibester/activity/TypingGameActivityTest.kt |  6 ++++++
 .../sdp/vibester/activity/AuthenticationActivity.kt |  9 +++++++++
 .../ch/sdp/vibester/activity/ProfileActivity.kt     |  8 +++++++-
 app/src/main/res/layout/activity_authentication.xml | 13 +++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index e64c99df5..826705d99 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -20,6 +20,8 @@ import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
 import ch.sdp.vibester.model.Song
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -28,8 +30,12 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class TypingGameActivityTest {
 
+    @get:Rule(order = 0)
+    var hiltRule = HiltAndroidRule(this)
+
     private val expectedSize = 200
     private fun setGameManager(numSongs:Int = 1, valid: Boolean = true): TypingGameManager {
         val epilogue = "{\"tracks\":{\"track\":["
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 35d383a76..077b65acd 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -11,11 +11,13 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.helper.IntentSwitcher
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
@@ -56,6 +58,8 @@ class AuthenticationActivity : AppCompatActivity() {
         val btLogIn = findViewById<Button>(R.id.logIn)
         val googleSignIn = findViewById<Button>(R.id.googleBtn)
 
+        val returnToMain = findViewById<FloatingActionButton>(R.id.authentication_returnToMain)
+
         val username = findViewById<EditText>(R.id.username)
         val password = findViewById<EditText>(R.id.password)
         email = findViewById(R.id.email)
@@ -73,6 +77,11 @@ class AuthenticationActivity : AppCompatActivity() {
         googleSignIn.setOnClickListener {
             signInGoogle()
         }
+
+        returnToMain.setOnClickListener {
+            IntentSwitcher.switchBackToWelcome(this)
+            finish()
+        }
     }
 
     public override fun onStart() {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 335cab8b9..8cb61343c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -58,11 +58,13 @@ class ProfileActivity : AppCompatActivity() {
 
         retToMain.setOnClickListener{
             IntentSwitcher.switchBackToWelcome(this)
+            finish()
         }
 
         logoutbutton.setOnClickListener{
             FirebaseAuth.getInstance().signOut()
             IntentSwitcher.switchBackToWelcome(this)
+            finish()
         }
 
         // Do not enable querying database while executing unit test
@@ -71,7 +73,11 @@ class ProfileActivity : AppCompatActivity() {
             queryDatabase()
         }else{
             var upTest: UserProfile? = intent.getSerializableExtra("userTestProfile") as UserProfile?
-            if (upTest == null) {setupProfile(UserProfile())}else{ setupProfile(upTest)}
+            if (upTest == null) {
+                setupProfile(UserProfile())
+            }else{
+                setupProfile(upTest)
+            }
         }
 
     }
diff --git a/app/src/main/res/layout/activity_authentication.xml b/app/src/main/res/layout/activity_authentication.xml
index e9c6d371c..15b2109e5 100644
--- a/app/src/main/res/layout/activity_authentication.xml
+++ b/app/src/main/res/layout/activity_authentication.xml
@@ -7,6 +7,19 @@
     android:background="@color/floral_white"
     tools:context=".activity.AuthenticationActivity">
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/authentication_returnToMain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="@color/light_coral"
+        android:clickable="true"
+        android:src="@android:drawable/ic_menu_revert"
+        app:borderWidth="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <TextView
         android:id="@+id/email"
         android:layout_width="367dp"

From fc4a99094038ff9e6868ed34f7ec64156ef96e80 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 13:07:02 +0200
Subject: [PATCH 11/45] removing hilt typing

---
 .../activity/TypingGameActivityTest.kt        | 31 ++++++++-----------
 .../vibester/activity/GameEndingActivity.kt   |  2 --
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index 826705d99..9f22ca862 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -30,11 +30,21 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@HiltAndroidTest
 class TypingGameActivityTest {
 
-    @get:Rule(order = 0)
-    var hiltRule = HiltAndroidRule(this)
+    @JvmField
+    @get:Rule
+    val activityRule = ActivityScenarioRule(TypingGameActivity::class.java)
+
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
 
     private val expectedSize = 200
     private fun setGameManager(numSongs:Int = 1, valid: Boolean = true): TypingGameManager {
@@ -56,21 +66,6 @@ class TypingGameActivityTest {
         return gameManager
     }
 
-    @Rule
-    @JvmField
-    val activityRule = ActivityScenarioRule(TypingGameActivity::class.java)
-
-    @Before
-    fun setUp() {
-        Intents.init()
-    }
-
-    @After
-    fun clean() {
-        Intents.release()
-    }
-
-
     @Test
     fun spaceGenTest() {
         val height = 10
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index 8525e70d9..ad75a7735 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -19,10 +19,8 @@ import javax.inject.Inject
  * A class representing the activity which appears upon
  * completion of a game. Shows various stats.
  */
-@AndroidEntryPoint
 class GameEndingActivity : AppCompatActivity() {
 
-    @Inject
     lateinit var dataGetter: DataGetter
 
     private var incorrectSongs: ArrayList<String>? = arrayListOf("Default song")

From ee8243994006963f586c76ffca61e977c4243a19 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 13:36:16 +0200
Subject: [PATCH 12/45] dumb modif

---
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index fbff0b241..a746af73e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 @HiltAndroidTest
-class ProfileActivityTest {
+class ProfileActivityTest { 
 
     @get:Rule
     var hiltRule = HiltAndroidRule(this)

From 40277bd43ce7f4d27e3620772d2c8c49115a045d Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 14:11:51 +0200
Subject: [PATCH 13/45] removed hilt where it should not be

---
 .../java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt | 4 ----
 .../java/ch/sdp/vibester/activity/GameEndingActivityTest.kt   | 4 ----
 .../ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt  | 4 ----
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt      | 2 +-
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
index adaa093d4..48ea10911 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
@@ -20,7 +20,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@HiltAndroidTest
 class BuzzerScreenActivityTest {
 
     @get:Rule
@@ -28,9 +27,6 @@ class BuzzerScreenActivityTest {
         BuzzerScreenActivity::class.java
     )
 
-    @get:Rule
-    var hiltRule = HiltAndroidRule(this)
-
     @Before
     fun setUp() {
         Intents.init()
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index a8f965e4b..d1dc59ebb 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -23,15 +23,11 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@HiltAndroidTest
 class GameEndingActivityTest {
 
     @get:Rule
     val activityRule = ActivityScenarioRule(GameEndingActivity::class.java)
 
-    @get:Rule
-    var hiltRule = HiltAndroidRule(this)
-
     @Before
     fun setUp() {
         Intents.init()
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index c8dcfe512..28d22b439 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -24,12 +24,8 @@ import org.junit.Assert.assertEquals
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@HiltAndroidTest
 class LyricsBelongGameActivityTest {
 
-    @get:Rule
-    var hiltRule = HiltAndroidRule(this)
-
     private val sleepTime: Long = 5000
     private val songName = "Thunder"
     private val artistName = "Imagine Dragons"
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index a746af73e..fbff0b241 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 @HiltAndroidTest
-class ProfileActivityTest { 
+class ProfileActivityTest {
 
     @get:Rule
     var hiltRule = HiltAndroidRule(this)

From de78a77a0a6136d6831dce4ad240f246cf470f55 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Mon, 25 Apr 2022 14:31:21 +0200
Subject: [PATCH 14/45] fix merging test error

---
 .../main/java/ch/sdp/vibester/activity/ProfileActivity.kt    | 4 ++--
 .../main/java/ch/sdp/vibester/activity/SearchUserActivity.kt | 4 ++--
 app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 6f5a73a7e..9977ef660 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -72,9 +72,9 @@ class ProfileActivity : AppCompatActivity() {
         if(!isUnitTest){
             queryDatabase()
         }else{
-            var upTest: UserProfile? = intent.getSerializableExtra("userTestProfile") as UserProfile?
+            var upTest: User? = intent.getSerializableExtra("userTestProfile") as User?
             if (upTest == null) {
-                setupProfile(UserProfile())
+                setupProfile(User())
             }else{
                 setupProfile(upTest)
             }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
index bd3b1fa28..69885b29f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.user.User
 
 import ch.sdp.vibester.user.UserProfileAdapter
@@ -23,7 +23,7 @@ class SearchUserActivity : AppCompatActivity() {
 
     private var recyclerView: RecyclerView? = null
     private var searchEditText: EditText? = null
-    var usersRepo = UsersRepo()
+    var usersRepo = DataGetter()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index 7d0c342bd..84ad6785f 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -8,14 +8,15 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
+
 
 /**
  * UserAdapter to set userProfile views with username and image in RecycleView. It is used to search for users.
  */
 class UserProfileAdapter constructor(val users: MutableList<User>,
                          val authenticator: FireBaseAuthenticator = FireBaseAuthenticator(),
-                         val usersRepo: UsersRepo = UsersRepo()
+                         val usersRepo: DataGetter = DataGetter()
                         ):
     RecyclerView.Adapter<UserProfileAdapter.UserProfileViewHolder>() {
 

From 93fffce5126488cbe2d90002ccd93fb231668998 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Tue, 26 Apr 2022 15:40:24 +0200
Subject: [PATCH 15/45] small update

---
 .../java/ch/sdp/vibester/activity/GameEndingActivity.kt   | 2 +-
 .../java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index ad75a7735..54ebd8783 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -59,7 +59,7 @@ class GameEndingActivity : AppCompatActivity() {
             } else {findViewById<TextView>(R.id.winnerText).text="Nobody won this game!"}
         }
 
-        //dataGetter.updateRelativeFieldInt(DbUserIdStore.getUID(), 1, "totalGames")
+        //dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
 
         if (intent.hasExtra("playerName")) {
             playerName = intent.getStringExtra("playerName")
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index d950c540a..c85637155 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -37,6 +37,14 @@ class FireBaseAuthenticator @Inject constructor() {
             }
         }
 
+        fun getCurrentUID(): String {
+            if (isLoggedIn()) {
+                return FirebaseAuth.getInstance().currentUser!!.uid
+            } else {
+                return ""
+            }
+        }
+
 
         /**
          * A function to return the result of google sign in

From 9647fb10df9f4fe2fcdf7a5c2fe54d8ba66485b6 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Tue, 26 Apr 2022 21:58:30 +0200
Subject: [PATCH 16/45] patch profileActivityTest

---
 .../java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt  | 2 +-
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index 42a4a79e9..f33fae2fd 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -71,7 +71,7 @@ class CreateProfileActivityTest {
         onView(withId(R.id.accountUsername)).perform(typeText(username),
             closeSoftKeyboard()
         )
-        
+
        onView(withId(R.id.createButton)).perform(click())
 
        Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index 01f96bb7b..7fc0440b0 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -111,6 +111,8 @@ class ProfileActivityTest {
         val inputProfile = User( "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile", inputProfile)
 
         UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)

From e57a32420917271085dab169c21899e10d038fd6 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Tue, 26 Apr 2022 22:21:06 +0200
Subject: [PATCH 17/45] patch profileActivityTest 2

---
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index 7fc0440b0..240396a05 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -89,7 +89,9 @@ class ProfileActivityTest {
         val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
-
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile", inputProfile)
+        
         UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)
 

From 65e849eecbfcd6f071451568ed2c5ef7b90043ff Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Tue, 26 Apr 2022 22:25:30 +0200
Subject: [PATCH 18/45] patch profileActivityTest 3

---
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index 240396a05..ceeff40f9 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -77,6 +77,8 @@ class ProfileActivityTest {
     fun clickBackToMain(){
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.profile_returnToMain)).perform(click())
@@ -91,7 +93,7 @@ class ProfileActivityTest {
         val intent = Intent(ctx, ProfileActivity::class.java)
         intent.putExtra("isUnitTest", true)
         intent.putExtra("userTestProfile", inputProfile)
-        
+
         UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)
 

From 9f13f281a4b0db12ea0ab6bb76f6eedcb4ff7f9d Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 00:13:44 +0200
Subject: [PATCH 19/45] massive user update

---
 .../activity/CreateProfileActivityTest.kt     |  2 +-
 .../activity/AuthenticationActivity.kt        | 42 +++++++++++++++----
 .../activity/CreateProfileActivity.kt         |  7 ++--
 .../vibester/activity/GameEndingActivity.kt   |  5 ++-
 .../sdp/vibester/activity/ProfileActivity.kt  |  3 +-
 .../ch/sdp/vibester/database/DataGetter.kt    | 12 +++---
 6 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index f33fae2fd..6e7654166 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -41,7 +41,7 @@ class CreateProfileActivityTest {
     val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(email: String) {
-        every {mockUsersRepo.createUser(any(), any(), any())} answers {
+        every {mockUsersRepo.createUser(any(), any(), any(), any())} answers {
             lastArg<(String) -> Unit>().invoke(email)
         }
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 077b65acd..44a55a01c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -11,6 +11,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.IntentSwitcher
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
@@ -20,6 +21,7 @@ import com.google.android.gms.tasks.Task
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.FirebaseUser
 import com.google.firebase.auth.GoogleAuthProvider
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
@@ -32,6 +34,9 @@ class AuthenticationActivity : AppCompatActivity() {
 
     private lateinit var googleSignInClient: GoogleSignInClient
 
+    @Inject
+    lateinit var dataGetter: DataGetter
+
     @Inject
     lateinit var authenticator: FireBaseAuthenticator
 
@@ -104,7 +109,7 @@ class AuthenticationActivity : AppCompatActivity() {
                 googleAuthFirebase(account.idToken!!)
             } catch (e: ApiException) {
                 Log.d(getString(R.string.log_tag), "Google sign in failed", e)
-                updateUI("Authentication Error", false)
+                updateUI("Authentication Error", false, null)
             }
         }
     }
@@ -117,14 +122,18 @@ class AuthenticationActivity : AppCompatActivity() {
                 if (task.isSuccessful) {
                     // Sign in success, update UI with the signed-in user's information
                     Log.d(getString(R.string.log_tag), "signInWithCredential:success")
+                    var createAcc: Boolean = false
+                    if(task.getResult().additionalUserInfo != null){
+                        createAcc = task.getResult().additionalUserInfo!!.isNewUser
+                    }
                     val user = auth.currentUser
                     if (user != null) {
-                        updateUI(user.email.toString(), false)
+                        updateUI(user.email.toString(), createAcc, user)
                     }
                 } else {
                     // fail
                     Log.d(getString(R.string.log_tag), "signInWithCredential:failure", task.exception)
-                    updateUI("Authentication Error", false)
+                    updateUI("Authentication Error", false, null)
                 }
             }
     }
@@ -193,32 +202,47 @@ class AuthenticationActivity : AppCompatActivity() {
             ).show()
             val user = authenticator.getCurrUser()
             if (user != null) {
-                updateUI(user.email, createAcc)
+                updateUI(user.email, createAcc, user)
             }
         } else {
             Toast.makeText(
                 baseContext, "Authentication failed.",
                 Toast.LENGTH_SHORT
             ).show()
-            updateUI("Authentication error", false)
+            updateUI("Authentication error", false, null)
         }
     }
 
+
+//TODO
+    private fun startNewActivity(email: String) {
+        val newIntent = Intent(this, CreateProfileActivity::class.java)
+        newIntent.putExtra("email", email)
+        startActivity(newIntent)
+    }
+
+
     private fun updateUI(
         emailText: String?,
         createAcc: Boolean,
+        user: FirebaseUser?
     ) {
         if (emailText != null) {
             if('@' in emailText && !createAcc) {
+                Log.e("baby shark", "true")
                 val newIntent = Intent(this, ProfileActivity::class.java)
                 newIntent.putExtra("email", emailText)
                 startActivity(newIntent)
             }
 
-            else if('@' in emailText && createAcc) {
-                val newIntent = Intent(this, CreateProfileActivity::class.java)
-                newIntent.putExtra("email", emailText)
-                startActivity(newIntent)
+            else if('@' in emailText && createAcc && user != null) { //
+                Log.e("baby shart", "toudoudoud")
+                dataGetter.createUser(
+                    emailText,
+                    user.uid,
+                    this::startNewActivity,
+                    user.uid
+                )
             }
 
             else {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
index 9dbd11095..a5f4593f7 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -8,6 +8,7 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageRepo
 import ch.sdp.vibester.util.Util
@@ -40,10 +41,8 @@ class CreateProfileActivity : AppCompatActivity() {
         val btnUploadImg = findViewById<Button>(R.id.uploadImg)
 
         btCreateAcc.setOnClickListener {
-            dataGetter.createUser(
-                email,
-                username.text.toString(),
-                this::startNewActivity)
+            dataGetter.updateFieldString(FireBaseAuthenticator.getCurrentUID(), username.text.toString(), "username")
+            startNewActivity(email)
         }
 
         btnUploadImg.setOnClickListener {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index 54ebd8783..edb2bca44 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -21,7 +21,7 @@ import javax.inject.Inject
  */
 class GameEndingActivity : AppCompatActivity() {
 
-    lateinit var dataGetter: DataGetter
+    var dataGetter = DataGetter()
 
     private var incorrectSongs: ArrayList<String>? = arrayListOf("Default song")
     private var statNames: ArrayList<String>? = arrayListOf(
@@ -59,7 +59,8 @@ class GameEndingActivity : AppCompatActivity() {
             } else {findViewById<TextView>(R.id.winnerText).text="Nobody won this game!"}
         }
 
-        //dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
+        dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
+        //dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
 
         if (intent.hasExtra("playerName")) {
             playerName = intent.getStringExtra("playerName")
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 3e282596e..4d878fc6c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -13,6 +13,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
+import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.model.UserSharedPref
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.IntentSwitcher
@@ -100,7 +101,7 @@ class ProfileActivity : AppCompatActivity() {
             findViewById<TextView>(textId).text = input.text.toString()
 
             if(name == "username"){
-                UserSharedPref.updateUsername(this, input.text.toString())
+                dataGetter.updateFieldString(FireBaseAuthenticator.getCurrentUID(), input.text.toString(), "username")
             }
         }
 
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index aeac39ce6..503a78b5f 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -52,12 +52,11 @@ class DataGetter @Inject constructor() {
     fun updateRelativeFieldInt(userID: String, newVal: Int, fieldName: String) {
         dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
             .child(fieldName)
-            .get().addOnCompleteListener { t ->
+            .get().addOnSuccessListener {t ->
                 dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
                     .child(fieldName)
-                    .setValue((t.result.value as Int?)!! + newVal)
+                    .setValue((t.value as Long?)!!.toInt() + newVal)
             }
-
     }
 
 
@@ -81,9 +80,8 @@ class DataGetter @Inject constructor() {
      * @param username the username of the new user
      * @param callback function to be called when the the user has been created
      */
-    fun createUser(email: String, username: String, callback: (String) -> Unit) {
-        var newUser = User(username, "", email, 0, 0, 0, 0)
-        val newId = Util.createNewId()
+    fun createUser(email: String, username: String, callback: (String) -> Unit, newId: String) {
+        var newUser = User(username, "", email, 0, 0, 0, 0, newId)
         dbRef.child(newId).setValue(newUser)
             .addOnSuccessListener {
                 callback(email)
@@ -114,7 +112,7 @@ class DataGetter @Inject constructor() {
                 for (snapshot in dataSnapshot.children) {
                     val userProfile:User? = snapshot.getValue(User::class.java)
                     if (userProfile != null) {
-                        userProfile.uid = snapshot.key.toString()
+                        //TODO dont care userProfile.uid = snapshot.key.toString()
                         users.add(userProfile)
                     }
                 }

From b8d646e473b75672bfd6d582256bcd030b76f06e Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 09:50:28 +0200
Subject: [PATCH 20/45] update tests

---
 .../activity/AuthenticationActivityTest.kt    |  4 +++-
 .../activity/BuzzerScreenActivityTest.kt      |  3 +++
 .../activity/CreateProfileActivityTest.kt     |  3 +++
 .../activity/GameEndingActivityTest.kt        |  3 +++
 app/src/main/java/ch/sdp/vibester/TestMode.kt | 17 +++++++++++++++++
 .../activity/AuthenticationActivity.kt        | 19 +++++++++++--------
 .../activity/CreateProfileActivity.kt         |  9 ++++++++-
 .../vibester/activity/GameEndingActivity.kt   |  6 ++++--
 .../ch/sdp/vibester/database/DataGetter.kt    | 19 ++++++++++++-------
 9 files changed, 64 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/TestMode.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
index 2336bc2d8..10f30f857 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.android.gms.tasks.Task
@@ -179,6 +180,8 @@ class AuthenticationActivityTest {
         val username = "user@user.com"
         val password = "password"
 
+        TestMode.setTest()
+
         val mockTask = createMockTask(true)
         val mockUser = createMockUser(username)
         every { mockAuthenticator.createAccount(username, password) } returns mockTask
@@ -187,7 +190,6 @@ class AuthenticationActivityTest {
         onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
         onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
         onView(withId(R.id.createAcc)).perform(click())
-
         Intents.intended(IntentMatchers.hasComponent(CreateProfileActivity::class.java.name))
         Intents.intended(IntentMatchers.hasExtra("email", username))
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
index eccc8333a..3d774c55b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
@@ -102,6 +103,8 @@ class BuzzerScreenActivityTest {
      */
     @Test
     fun checkIntentOnEnding() {
+        TestMode.setTest()
+
         val mockArray = arrayListOf<String>("One", "Two", "Three", "Four", "Five")
 
         val incArray: ArrayList<String> = mockArray
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index 6e7654166..50497c5ff 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -10,6 +10,7 @@ import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers.* //change this import
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
@@ -57,6 +58,8 @@ class CreateProfileActivityTest {
 
     @Test
     fun createAccCorrect() {
+        TestMode.setTest()
+
         var username = "mockUsername"
         var mockEmail = "mockEmail@test.com"
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index d1dc59ebb..1eb1a830f 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
@@ -48,6 +49,8 @@ class GameEndingActivityTest {
 
     @Test
     fun checkIntentOnCalled() {
+        TestMode.setTest()
+
         incArray.addAll(arrayOf("One", "Two", "Three"))
         statNames.addAll(
             arrayOf(
diff --git a/app/src/main/java/ch/sdp/vibester/TestMode.kt b/app/src/main/java/ch/sdp/vibester/TestMode.kt
new file mode 100644
index 000000000..11cc31361
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/TestMode.kt
@@ -0,0 +1,17 @@
+package ch.sdp.vibester
+
+class TestMode private constructor(){
+    companion object{
+        private var isTest: Boolean = false
+
+        fun setTest(){
+            isTest = true
+        }
+
+        fun isTest(): Boolean {
+            return isTest
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 44a55a01c..ba7bdd4c1 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -10,6 +10,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.IntentSwitcher
@@ -229,20 +230,22 @@ class AuthenticationActivity : AppCompatActivity() {
     ) {
         if (emailText != null) {
             if('@' in emailText && !createAcc) {
-                Log.e("baby shark", "true")
                 val newIntent = Intent(this, ProfileActivity::class.java)
                 newIntent.putExtra("email", emailText)
                 startActivity(newIntent)
             }
 
             else if('@' in emailText && createAcc && user != null) { //
-                Log.e("baby shart", "toudoudoud")
-                dataGetter.createUser(
-                    emailText,
-                    user.uid,
-                    this::startNewActivity,
-                    user.uid
-                )
+                if(TestMode.isTest()){
+                    startNewActivity(emailText)
+                }else{
+                    dataGetter.createUser(
+                        emailText,
+                        user.uid,
+                        this::startNewActivity,
+                        user.uid
+                    )
+                }
             }
 
             else {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
index a5f4593f7..78c46ddbd 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -8,6 +8,7 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageRepo
@@ -41,7 +42,13 @@ class CreateProfileActivity : AppCompatActivity() {
         val btnUploadImg = findViewById<Button>(R.id.uploadImg)
 
         btCreateAcc.setOnClickListener {
-            dataGetter.updateFieldString(FireBaseAuthenticator.getCurrentUID(), username.text.toString(), "username")
+            if (!TestMode.isTest()) {
+                dataGetter.updateFieldString(
+                    FireBaseAuthenticator.getCurrentUID(),
+                    username.text.toString(),
+                    "username"
+                )
+            }
             startNewActivity(email)
         }
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index edb2bca44..3b362ba54 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -8,6 +8,7 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.DbUserIdStore
@@ -59,8 +60,9 @@ class GameEndingActivity : AppCompatActivity() {
             } else {findViewById<TextView>(R.id.winnerText).text="Nobody won this game!"}
         }
 
-        dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
-        //dataGetter.updateFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
+        if(!TestMode.isTest()){
+            dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
+        }
 
         if (intent.hasExtra("playerName")) {
             playerName = intent.getStringExtra("playerName")
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 503a78b5f..56170d437 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -2,6 +2,7 @@ package ch.sdp.vibester.database
 
 import android.content.ContentValues
 import android.util.Log
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.user.User
 import ch.sdp.vibester.util.Util
@@ -50,13 +51,17 @@ class DataGetter @Inject constructor() {
     }
 
     fun updateRelativeFieldInt(userID: String, newVal: Int, fieldName: String) {
-        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
-            .child(fieldName)
-            .get().addOnSuccessListener {t ->
-                dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
-                    .child(fieldName)
-                    .setValue((t.value as Long?)!!.toInt() + newVal)
-            }
+        if(!TestMode.isTest()) {
+            dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+                .child(fieldName)
+                .get().addOnSuccessListener { t ->
+                    if(!TestMode.isTest()) {
+                        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+                            .child(fieldName)
+                            .setValue((t.value as Long?)!!.toInt() + newVal)
+                    }
+                }
+        }
     }
 
 

From c5455463d4d061c05050067313d9b852bf553177 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 14:52:07 +0200
Subject: [PATCH 21/45] some improvements

---
 .../vibester/activity/GameSetupActivity.kt    | 22 ++++++++++
 .../sdp/vibester/activity/WelcomeActivity.kt  | 18 ++++----
 .../ch/sdp/vibester/database/DataGetter.kt    | 43 ++++++++++++++-----
 .../sdp/vibester/helper/AllPurposeFunction.kt | 20 +++++++++
 .../res/layout/activity_game_setup_screen.xml | 16 ++++++-
 .../res/layout/activity_welcome_screen.xml    |  9 ++--
 6 files changed, 102 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt

diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
index adb620601..374f49138 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
@@ -15,7 +16,9 @@ import ch.sdp.vibester.api.LastfmApiInterface
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.api.LastfmUri
 import ch.sdp.vibester.helper.GameManager
+import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.helper.TypingGameManager
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.gson.Gson
 import retrofit2.Call
 import retrofit2.Callback
@@ -36,6 +39,25 @@ class GameSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListene
         setContentView(R.layout.activity_game_setup_screen)
         val ctx: Context = this
 
+        val retButton: FloatingActionButton = findViewById(R.id.gameSetup_returnToMain)
+
+        retButton.setOnClickListener {
+            if(findViewById<LinearLayout>(R.id.chooseGame).visibility == VISIBLE){
+                Log.e("MENU LOGIC", "should return menu")
+                IntentSwitcher.switchBackToWelcome(this)
+                finish()
+            }else if (findViewById<ConstraintLayout>(R.id.chooseGenre).visibility == VISIBLE){
+                Log.e("MENU LOGIC", "back to choose game")
+                findViewById<LinearLayout>(R.id.chooseGame).visibility = VISIBLE
+                findViewById<ConstraintLayout>(R.id.chooseGenre).visibility = GONE
+            }else if (findViewById<ConstraintLayout>(R.id.chooseDifficulty).visibility == VISIBLE){
+                Log.e("MENU LOGIC", "back to choose genre")
+                findViewById<ConstraintLayout>(R.id.chooseGenre).visibility = VISIBLE
+                findViewById<ConstraintLayout>(R.id.chooseDifficulty).visibility = GONE
+            }
+        }
+
+
         val spinnerDifficulty: Spinner = findViewById(R.id.difficulty_spinner)
         val adapter = ArrayAdapter.createFromResource(
             ctx,
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index 26874ee09..4b0815cc1 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -1,13 +1,11 @@
 package ch.sdp.vibester.activity
 
-//import ch.sdp.vibester.profile.ProfileDataProvider
-import android.content.Context
 import android.content.Intent
-import android.net.ConnectivityManager
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
+import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
@@ -16,13 +14,7 @@ import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.Database
 import ch.sdp.vibester.database.PersistanceSetter
-import com.google.firebase.database.ktx.database
-import com.google.firebase.ktx.Firebase
-import ch.sdp.vibester.model.UserSharedPref
-import com.google.firebase.database.DataSnapshot
-import com.google.firebase.database.DatabaseError
-import com.google.firebase.database.ValueEventListener
-import java.util.function.BinaryOperator
+
 
 class WelcomeActivity : AppCompatActivity() {
 
@@ -54,6 +46,12 @@ class WelcomeActivity : AppCompatActivity() {
         PersistanceSetter.setPersistance()
         Database.get()
 
+        // Disable User Search if not connected
+        if(!FireBaseAuthenticator.isLoggedIn()){
+            val buttonToSearchUser = findViewById<Button>(R.id.welcome_search)
+            buttonToSearchUser.isEnabled = false
+        }
+
     }
 
     private fun sendDirectIntent(arg: Class<*>?) {
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 56170d437..6ad105788 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -4,8 +4,8 @@ import android.content.ContentValues
 import android.util.Log
 import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.helper.AllPurposeFunction
 import ch.sdp.vibester.user.User
-import ch.sdp.vibester.util.Util
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.ValueEventListener
@@ -21,11 +21,6 @@ class DataGetter @Inject constructor() {
     val authenticator: FireBaseAuthenticator = FireBaseAuthenticator()
 
 
-    // Constructor
-    init {
-        Log.e("DATAGETTER","Hello world")
-    }
-
     /**
      * This function updates a specific string field of a user in the database
      * @param userID the id of the user which is being updated
@@ -33,7 +28,7 @@ class DataGetter @Inject constructor() {
      * @param fieldName the field name of the field that is being updated
      */
     fun updateFieldString(userID: String, newVal: String, fieldName: String) {
-        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+        dbRef.child(userID)
             .child(fieldName)
             .setValue(newVal)
     }
@@ -45,18 +40,25 @@ class DataGetter @Inject constructor() {
      * @param fieldName the field name of the field that is being updated
      */
     fun updateFieldInt(userID: String, newVal: Int, fieldName: String) {
-        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+        dbRef.child(userID)
             .child(fieldName)
             .setValue(newVal)
     }
 
+
+    /**
+     * This function increments a specific int field of a user in the database
+     * @param userID the id of the user which is being updated
+     * @param newVal (Int) the increment value of the field that is being updated
+     * @param fieldName the field name of the field that is being updated
+     */
     fun updateRelativeFieldInt(userID: String, newVal: Int, fieldName: String) {
         if(!TestMode.isTest()) {
-            dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+            dbRef.child(userID)
                 .child(fieldName)
                 .get().addOnSuccessListener { t ->
                     if(!TestMode.isTest()) {
-                        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+                        dbRef.child(userID)
                             .child(fieldName)
                             .setValue((t.value as Long?)!!.toInt() + newVal)
                     }
@@ -64,6 +66,26 @@ class DataGetter @Inject constructor() {
         }
     }
 
+    /**
+     * This function sets the best between current and given in argument value
+     * @param userID the id of the user which is being updated
+     * @param newVal (Int) the new value of the field that is being compared and updated
+     * @param fieldName the field name of the field that is being updated
+     */
+    fun updateBestFieldInt(userID: String, newVal: Int, fieldName: String) {
+        if(!TestMode.isTest()) {
+            dbRef.child(userID)
+                .child(fieldName)
+                .get().addOnSuccessListener { t ->
+                    if(!TestMode.isTest()) {
+                        dbRef.child(userID)
+                            .child(fieldName)
+                            .setValue(AllPurposeFunction.biggerInt((t.value as Long?)!!.toInt(), newVal))
+                    }
+                }
+        }
+    }
+
 
     /**
      * Update a subfield of user's field
@@ -117,7 +139,6 @@ class DataGetter @Inject constructor() {
                 for (snapshot in dataSnapshot.children) {
                     val userProfile:User? = snapshot.getValue(User::class.java)
                     if (userProfile != null) {
-                        //TODO dont care userProfile.uid = snapshot.key.toString()
                         users.add(userProfile)
                     }
                 }
diff --git a/app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt b/app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt
new file mode 100644
index 000000000..31b24639b
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt
@@ -0,0 +1,20 @@
+package ch.sdp.vibester.helper
+
+class AllPurposeFunction private constructor(){
+    companion object{
+
+        /**
+         * Functions that return the biggest value between the two given in argument
+         * @param i1 first int value to be compared
+         * @param i2 second int value to be compared
+         * @return The biggest Int
+         */
+        fun biggerInt(i1: Int, i2: Int): Int{
+            if (i1 > i2){
+                return i1
+            }else{
+                return i2
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_game_setup_screen.xml b/app/src/main/res/layout/activity_game_setup_screen.xml
index 65022f20a..8d4b644ac 100644
--- a/app/src/main/res/layout/activity_game_setup_screen.xml
+++ b/app/src/main/res/layout/activity_game_setup_screen.xml
@@ -8,7 +8,21 @@
     android:noHistory="true"
     tools:context=".activity.GameSetupActivity">
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/gameSetup_returnToMain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="@color/light_coral"
+        android:clickable="true"
+        android:src="@android:drawable/ic_menu_revert"
+        app:borderWidth="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <LinearLayout
+        android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -153,8 +167,8 @@
                             android:background="@drawable/squared_button"
                             android:backgroundTint="@color/cg_blue"
                             android:elevation="10dp"
-                            android:stateListAnimator="@null"
                             android:onClick="chooseGame"
+                            android:stateListAnimator="@null"
                             android:text="@string/game_buzzer_title"
                             android:textColor="@color/white"
                             android:translationZ="10dp" />
diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 18ef2d478..2a33c1740 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -94,12 +94,12 @@
                 android:layout_marginTop="10dp"
                 android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
+                android:enabled="false"
                 android:stateListAnimator="@null"
                 android:text="@string/welcomeScreen_settings"
                 android:translationZ="10dp"
-                app:icon="@android:drawable/ic_menu_manage"
-                android:enabled="false"
-                />
+                android:visibility="gone"
+                app:icon="@android:drawable/ic_menu_manage" />
 
             <Button
                 android:id="@+id/welcome_download"
@@ -124,7 +124,8 @@
                 android:onClick="switchToSearch"
                 android:stateListAnimator="@null"
                 android:text="@string/search_users"
-                android:translationZ="10dp"/>
+                android:translationZ="10dp"
+                app:icon="@android:drawable/ic_menu_search" />
 
 
             <Space

From e0dcb23bcd1cb3ec27e43a499839ac5922c1513e Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 15:33:22 +0200
Subject: [PATCH 22/45] put scores update for typing game

---
 .../sdp/vibester/activity/GameEndingActivity.kt  |  4 ----
 .../sdp/vibester/activity/TypingGameActivity.kt  | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index 3b362ba54..9303aa366 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -22,7 +22,6 @@ import javax.inject.Inject
  */
 class GameEndingActivity : AppCompatActivity() {
 
-    var dataGetter = DataGetter()
 
     private var incorrectSongs: ArrayList<String>? = arrayListOf("Default song")
     private var statNames: ArrayList<String>? = arrayListOf(
@@ -60,9 +59,6 @@ class GameEndingActivity : AppCompatActivity() {
             } else {findViewById<TextView>(R.id.winnerText).text="Nobody won this game!"}
         }
 
-        if(!TestMode.isTest()){
-            dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
-        }
 
         if (intent.hasExtra("playerName")) {
             playerName = intent.getStringExtra("playerName")
diff --git a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
index 09eaa8dfa..c1f6ac45e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -9,7 +9,10 @@ import android.widget.*
 import androidx.core.content.ContextCompat.getColor
 import androidx.core.widget.addTextChangedListener
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.ItunesMusicApi
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.DisplayContents
 import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.TypingGameManager
@@ -207,9 +210,16 @@ class TypingGameActivity : GameActivity() {
         super.endRound(gameManager)
         //TODO: is it ok for the last round to go to the end game directly without waiting for the next btn?
         toggleNextBtnVisibility(true)
-        /*if (endGame(gameManager)) {
-            switchToEnding(gameManager)
-        }*/
+
+        // If currently not in test and has finished the game, update the scores
+        if (isEndGame(gameManager) && !TestMode.isTest()) {
+            val dataGetter = DataGetter()
+            dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
+            dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), gameManager.getCorrectSongs().size, "correctSongs")
+            dataGetter.updateBestFieldInt(FireBaseAuthenticator.getCurrentUID(), gameManager.getScore(), "bestScore")
+
+        }
+
     }
 
     /**

From 6c54d027f17783fdabb76e6b9ebc0493596c9a2a Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 16:24:56 +0200
Subject: [PATCH 23/45] update search user welcome test

---
 .../sdp/vibester/activity/WelcomeActivityTest.kt |  5 +++++
 .../ch/sdp/vibester/activity/WelcomeActivity.kt  | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 154f11527..b4a2fa628 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -1,5 +1,7 @@
 package ch.sdp.vibester.activity
 
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.intent.Intents
@@ -9,6 +11,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import com.google.firebase.auth.FirebaseAuth
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -17,6 +20,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.junit.runner.manipulation.Ordering
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
@@ -71,6 +75,7 @@ class WelcomeActivityTest {
 
     @Test
     fun checkIntentOnSearch() {
+        TestMode.setTest()
         onView(withId(R.id.welcome_search)).perform(click())
         intended(hasComponent(SearchUserActivity::class.java.name))
     }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index 4b0815cc1..732b82b92 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -9,6 +9,7 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.InternetState
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
@@ -45,13 +46,6 @@ class WelcomeActivity : AppCompatActivity() {
         Log.e("INFO: Should Access", ((InternetState.hasAccessedInternetOnce(this))).toString())
         PersistanceSetter.setPersistance()
         Database.get()
-
-        // Disable User Search if not connected
-        if(!FireBaseAuthenticator.isLoggedIn()){
-            val buttonToSearchUser = findViewById<Button>(R.id.welcome_search)
-            buttonToSearchUser.isEnabled = false
-        }
-
     }
 
     private fun sendDirectIntent(arg: Class<*>?) {
@@ -80,6 +74,12 @@ class WelcomeActivity : AppCompatActivity() {
     }
 
     fun switchToSearch(view: View) {
-        sendDirectIntent(SearchUserActivity::class.java)
+        // Disable User Search if not connected
+        if(!FireBaseAuthenticator.isLoggedIn() && !TestMode.isTest()){
+            val buttonToSearchUser = findViewById<Button>(R.id.welcome_search)
+            buttonToSearchUser.isEnabled = false
+        }else{
+            sendDirectIntent(SearchUserActivity::class.java)
+        }
     }
 }
\ No newline at end of file

From ede24a33669ee4a6799b631830f2e5a2650d73fc Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 18:09:40 +0200
Subject: [PATCH 24/45] refactor +add test + optimize imports

---
 .../java/ch/sdp/vibester/UtilTest.kt          |   3 +-
 .../activity/AuthenticationActivityTest.kt    |   7 +
 .../activity/BuzzerScreenActivityTest.kt      |   2 -
 .../activity/BuzzerSetupActivityTest.kt       |   4 -
 .../activity/CreateProfileActivityTest.kt     |   3 +-
 .../vibester/activity/DownloadActivityTest.kt |  12 --
 .../activity/GameEndingActivityTest.kt        |   3 +-
 .../activity/GameSetupActivityTest.kt         |  11 ++
 .../activity/LyricsBelongGameActivityTest.kt  |   7 +-
 .../vibester/activity/ProfileActivityTest.kt  |   6 +-
 .../activity/ScoreBoardActivityTest.kt        |   3 +-
 .../activity/TypingGameActivityTest.kt        |   5 +-
 .../vibester/activity/WelcomeActivityTest.kt  |   8 +-
 .../auth/FireBaseAuthenticatorTest.kt         |  36 +++++
 .../sdp/vibester/model/UserSharedPrefTest.kt  |  49 ------
 .../vibester/activity/BuzzerScreenActivity.kt |   2 -
 .../vibester/activity/BuzzerSetupActivity.kt  |   2 +-
 .../activity/CreateProfileActivity.kt         |  10 +-
 .../sdp/vibester/activity/DownloadActivity.kt |   6 +-
 .../ch/sdp/vibester/activity/GameActivity.kt  |   2 +-
 .../vibester/activity/GameEndingActivity.kt   |   8 -
 .../activity/LyricsBelongGameActivity.kt      |   2 +-
 .../sdp/vibester/activity/ProfileActivity.kt  |   1 -
 .../sdp/vibester/activity/WelcomeActivity.kt  |   1 -
 .../vibester/auth/FireBaseAuthenticator.kt    |  28 +---
 .../java/ch/sdp/vibester/database/Database.kt |   1 -
 .../ch/sdp/vibester/model/UserSharedPref.kt   | 147 ------------------
 27 files changed, 85 insertions(+), 284 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
 delete mode 100644 app/src/androidTest/java/ch/sdp/vibester/model/UserSharedPrefTest.kt
 delete mode 100644 app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt b/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
index f081c9a67..9a64f8698 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
@@ -1,10 +1,9 @@
 package ch.sdp.vibester
 
 import ch.sdp.vibester.util.Util
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
index 10f30f857..b9d4f7c6e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -132,6 +132,13 @@ class AuthenticationActivityTest {
         onView(withId(R.id.email)).check(matches(withText("Empty email or password")))
     }
 
+    @Test
+    fun returnToMain() {
+        onView(withId(R.id.authentication_returnToMain)).perform(click())
+        Intents.intended(IntentMatchers.hasComponent(WelcomeActivity::class.java.name))
+    }
+
+
     @Test
     fun stringValidationWrongEmail() {
         val username = "john"
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
index 3d774c55b..956144ca8 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
@@ -15,8 +15,6 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.TestMode
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt
index c0a64452c..bc0102996 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt
@@ -1,8 +1,5 @@
 package ch.sdp.vibester.activity
-import android.content.Context
 import android.content.Intent
-import android.widget.FrameLayout
-import android.widget.LinearLayout
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onData
@@ -22,7 +19,6 @@ import ch.sdp.vibester.R
 import org.hamcrest.Matchers
 import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index 50497c5ff..fe2899e69 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -7,7 +7,7 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers.* //change this import
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.TestMode
@@ -59,7 +59,6 @@ class CreateProfileActivityTest {
     @Test
     fun createAccCorrect() {
         TestMode.setTest()
-
         var username = "mockUsername"
         var mockEmail = "mockEmail@test.com"
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
index ff30d3b5b..dd7688044 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
@@ -1,22 +1,10 @@
 package ch.sdp.vibester.activity
 
-import android.content.Intent
-import android.view.View
-import androidx.test.core.app.ActivityScenario
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.*
-import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import ch.sdp.vibester.R
 import org.junit.After
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
-import org.junit.Test
-import java.io.File
 
 class DownloadActivityTest {
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index 1eb1a830f..eb3772971 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -15,8 +15,6 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.TestMode
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -75,6 +73,7 @@ class GameEndingActivityTest {
             Intent(ApplicationProvider.getApplicationContext(), GameEndingActivity::class.java)
         intent.putExtra("playerName", name)
         intent.putExtra("nbIncorrectSong", nbInc)
+        intent.putExtra("Winner Name", "Testing the Placeholder")
 
         intent.putStringArrayListExtra("str_arr_inc", incArray)
         intent.putStringArrayListExtra("str_arr_name", statNames)
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
index 2e44abb86..850b0c381 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
@@ -8,6 +8,7 @@ import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -52,6 +53,16 @@ class GameSetupActivityTest {
         onView(withId(R.id.difficulty_spinner)).check(matches(withSpinnerText("Easy")))
     }
 
+    @Test
+    fun checkReturnButton() {
+        onView(withId(R.id.local_buzzer_game_button)).perform(scrollTo(), click())
+        onView(withId(R.id.btsButton)).perform(click())
+        onView(withId(R.id.gameSetup_returnToMain)).perform(click())
+        onView(withId(R.id.gameSetup_returnToMain)).perform(click())
+        onView(withId(R.id.gameSetup_returnToMain)).perform(click())
+        Intents.intended(IntentMatchers.hasComponent(WelcomeActivity::class.java.name))
+    }
+
     @Test
     fun checkCustomSelectMedium() {
         onView(withId(R.id.local_buzzer_game_button)).perform(scrollTo(), click())
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index 28d22b439..d09ca1306 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -16,11 +16,12 @@ import androidx.test.rule.GrantPermissionRule
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
 import org.hamcrest.CoreMatchers.not
-import org.junit.*
+import org.junit.After
 import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index ceeff40f9..899396c52 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -10,11 +10,11 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers.* //change this import
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.DataGetter
-import ch.sdp.vibester.model.UserSharedPref
 import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -94,7 +94,6 @@ class ProfileActivityTest {
         intent.putExtra("isUnitTest", true)
         intent.putExtra("userTestProfile", inputProfile)
 
-        UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)
 
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
@@ -118,7 +117,6 @@ class ProfileActivityTest {
         intent.putExtra("isUnitTest", true)
         intent.putExtra("userTestProfile", inputProfile)
 
-        UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)
 
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
index 8549856f1..30fe70ac0 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
@@ -6,7 +6,8 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index 9f22ca862..27a27857e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -13,15 +13,14 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
 import ch.sdp.vibester.model.Song
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index b4a2fa628..b642ebf55 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -1,7 +1,5 @@
 package ch.sdp.vibester.activity
 
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.intent.Intents
@@ -20,7 +18,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.runner.manipulation.Ordering
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
@@ -79,4 +76,9 @@ class WelcomeActivityTest {
         onView(withId(R.id.welcome_search)).perform(click())
         intended(hasComponent(SearchUserActivity::class.java.name))
     }
+
+    @Test
+    fun checkIntentOnSearchWithoutTestMode() {
+        onView(withId(R.id.welcome_search)).perform(click())
+    }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
new file mode 100644
index 000000000..c86afcacc
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
@@ -0,0 +1,36 @@
+package ch.sdp.vibester.auth
+
+import androidx.test.core.app.ApplicationProvider
+import ch.sdp.vibester.TestMode
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThrows
+import org.junit.Test
+
+class FireBaseAuthenticatorTest {
+
+    @Test
+    fun checkTestModeGetMail(){
+        TestMode.setTest()
+        assertThrows(NullPointerException::class.java, {
+            FireBaseAuthenticator.getCurrentUserMail()
+        })
+    }
+
+    @Test
+    fun checkTestModeGetUID(){
+        TestMode.setTest()
+        assertThrows(NullPointerException::class.java, {
+            FireBaseAuthenticator.getCurrentUID()
+        })
+    }
+
+    @Test
+    fun checkGoogleFakeRequestCode(){
+        assertEquals("Authentication error", FireBaseAuthenticator.googleActivityResult(0, 0, null, ApplicationProvider.getApplicationContext()))
+    }
+
+    @Test
+    fun checkGoogleFakeGoodCode(){
+        assertEquals("Authentication error", FireBaseAuthenticator.googleActivityResult(1000, 0, null, ApplicationProvider.getApplicationContext()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/UserSharedPrefTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/UserSharedPrefTest.kt
deleted file mode 100644
index 63349a2ed..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/model/UserSharedPrefTest.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package ch.sdp.vibester.model
-
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import ch.sdp.vibester.user.User
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class UserSharedPrefTest {
-    @Test
-    fun sharedPrefTest(){
-        val ctx = ApplicationProvider.getApplicationContext() as Context
-
-        val mailTest = "lisa@test.com"
-        UserSharedPref.userReset(ctx, mailTest)
-        UserSharedPref.updateUsername(ctx, "Lalisa Bon")
-        UserSharedPref.updateScore(ctx)
-        Thread.sleep(1000)
-//        assertEquals(mailTest, UserSharedPref.getUser(ctx).email) //TODO temporary disable does not pass on CI
-    }
-
-    @Test
-    fun sharedPrefTest2(){
-        val ctx = ApplicationProvider.getApplicationContext() as Context
-        val username: String = "myUsername"
-        val image: String = "myImage"
-        val email: String = "myEmail"
-        val totalGames: Int = 10
-        val bestScore: Int = 27
-        val correctSongs: Int = 16
-        val ranking: Int = 6
-
-        val pro = User(username, image, email, totalGames, bestScore, correctSongs, ranking)
-        UserSharedPref.setUser(ctx, pro, false)
-        UserSharedPref.updateScore(ctx, 1, -1, 0, 1)
-        Thread.sleep(1000)
-        val updated = UserSharedPref.getUser(ctx)
-
-        assertEquals(pro.username, updated.username)
-        assertEquals(pro.image, updated.image)
-        assertEquals(pro.email, updated.email)
-        assertEquals(pro.totalGames+1, updated.totalGames)
-        assertEquals(pro.bestScore-1, updated.bestScore)
-        assertEquals(pro.correctSongs, updated.correctSongs)
-        assertEquals(pro.ranking+1, updated.ranking)
-    }
-
-
-}
diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
index 5161ba1f8..0ab11020c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
@@ -12,8 +12,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.BuzzerScoreUpdater
 import ch.sdp.vibester.R
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 
 
 class BuzzerScreenActivity : AppCompatActivity() {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt
index b32f3a1bb..fe46631b8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt
@@ -2,10 +2,10 @@ package ch.sdp.vibester.activity
 
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.*
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
 import ch.sdp.vibester.R
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
index 78c46ddbd..85baffb8e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -2,11 +2,11 @@ package ch.sdp.vibester.activity
 
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
@@ -42,12 +42,8 @@ class CreateProfileActivity : AppCompatActivity() {
         val btnUploadImg = findViewById<Button>(R.id.uploadImg)
 
         btCreateAcc.setOnClickListener {
-            if (!TestMode.isTest()) {
-                dataGetter.updateFieldString(
-                    FireBaseAuthenticator.getCurrentUID(),
-                    username.text.toString(),
-                    "username"
-                )
+            if (!TestMode.isTest()){
+                dataGetter.updateFieldString(FireBaseAuthenticator.getCurrentUID(), username.text.toString(), "username")
             }
             startNewActivity(email)
         }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index aa680ad44..add288a4a 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -9,19 +9,17 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Environment
-import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.ItunesMusicApi
 import ch.sdp.vibester.model.Song
 import okhttp3.OkHttpClient
-import org.w3c.dom.Text
-import java.lang.IllegalArgumentException
+
 /*
  * Activity that handles downloading of song extracts.
  */
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt
index 265417400..e8e35ca48 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt
@@ -3,10 +3,10 @@ package ch.sdp.vibester.activity
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Handler
 import android.view.Gravity
 import android.widget.*
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index 9303aa366..c4a87c08f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -4,17 +4,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.Window
-import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
-import ch.sdp.vibester.TestMode
-import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.database.DataGetter
-import ch.sdp.vibester.database.DbUserIdStore
-import ch.sdp.vibester.model.UserSharedPref
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 /**
  * A class representing the activity which appears upon
diff --git a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
index d66e674b2..9ce71fa09 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -7,7 +7,7 @@ import android.speech.RecognizerIntent
 import android.view.View
 import android.widget.*
 import ch.sdp.vibester.R
-import ch.sdp.vibester.api.*
+import ch.sdp.vibester.api.LyricsOVHApiInterface
 import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.model.Lyric
 import retrofit2.Call
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 4d878fc6c..87bf6eb1f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -14,7 +14,6 @@ import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.model.UserSharedPref
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.user.User
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index 732b82b92..eee7c7638 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -12,7 +12,6 @@ import ch.sdp.vibester.R
 import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.InternetState
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.Database
 import ch.sdp.vibester.database.PersistanceSetter
 
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index c85637155..b00923852 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -3,10 +3,9 @@ package ch.sdp.vibester.auth
 
 import android.content.Context
 import android.content.Intent
-import android.util.Log
+import ch.sdp.vibester.TestMode
 import com.google.android.gms.auth.api.identity.Identity
 import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
@@ -30,7 +29,7 @@ class FireBaseAuthenticator @Inject constructor() {
          * API: return the mail of the user if logged in otherwise empty string
          */
         fun getCurrentUserMail(): String {
-            if (isLoggedIn()) {
+            if (isLoggedIn() || TestMode.isTest()) {
                 return FirebaseAuth.getInstance().currentUser!!.email.toString()
             } else {
                 return ""
@@ -38,7 +37,7 @@ class FireBaseAuthenticator @Inject constructor() {
         }
 
         fun getCurrentUID(): String {
-            if (isLoggedIn()) {
+            if (isLoggedIn() || TestMode.isTest()) {
                 return FirebaseAuth.getInstance().currentUser!!.uid
             } else {
                 return ""
@@ -57,31 +56,14 @@ class FireBaseAuthenticator @Inject constructor() {
                 try {
                     val account = GoogleSignIn.getSignedInAccountFromIntent(data).result
                     val client = Identity.getSignInClient(ctx)
-
-
-
                     val idToken = client.getSignInCredentialFromIntent(data).googleIdToken
-                    Log.e("IDTOK", idToken!!)
                     val ficred = GoogleAuthProvider.getCredential(idToken, null)
-                    FirebaseAuth.getInstance().signInWithCredential(ficred).addOnCompleteListener{ task->
-                        if(task.isSuccessful){
-
-                            Log.e("Task", "successful")
-                        }else{
-                            Log.e("Task","not success")
-                        }
-                    }
-
-
-
-
+                    FirebaseAuth.getInstance().signInWithCredential(ficred)
                     return account.email
-                } catch (e: ApiException) {
-                    Log.e("hey you one", e.stackTraceToString())
+                } catch (e: Exception) {
                     return "Authentication error"
                 }
             } else {
-                Log.e("hey you two", "")
                 return "Authentication error"
             }
         }
diff --git a/app/src/main/java/ch/sdp/vibester/database/Database.kt b/app/src/main/java/ch/sdp/vibester/database/Database.kt
index b61649acc..9c813a41b 100644
--- a/app/src/main/java/ch/sdp/vibester/database/Database.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/Database.kt
@@ -1,6 +1,5 @@
 package ch.sdp.vibester.database
 
-import com.google.firebase.auth.FirebaseAuthSettings
 import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.ktx.database
 import com.google.firebase.ktx.Firebase
diff --git a/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt b/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt
deleted file mode 100644
index 2fb759151..000000000
--- a/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-package ch.sdp.vibester.model
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import ch.sdp.vibester.database.DataGetter
-import ch.sdp.vibester.user.User
-import com.google.firebase.database.*
-import java.util.*
-
-/**
- * This static class store the users data offline + in the db
- */
-class UserSharedPref private constructor() {
-    companion object{
-        val USERNAME = "username"
-        val IMAGE = "image"
-        val EMAIL = "email"
-        val TOTAL_GAMES = "totalGames"
-        val BEST_SCORE = "bestScore"
-        val CORRECT_SONGS = "correctSongs"
-        val RANKING = "ranking"
-        val ONLINE = "online"
-
-        var dbAccess : DataGetter = DataGetter()
-
-
-        private fun getSharedPreferences(ctx: Context): SharedPreferences? {
-            return PreferenceManager.getDefaultSharedPreferences(ctx)
-        }
-
-        /**
-         * Reset the current user stored locally with a retrieved one from db
-         * @param Context The app context
-         * @param email the email of the user
-         * @param online if false, does not store in db
-         */
-        fun userReset(ctx: Context, email: String, online: Boolean = true){
-            setUser(ctx, User(email=email), online)
-            if (online){
-                dbAccess = DataGetter()
-                val call = {prof:User -> setUser(ctx, prof, online)}
-                dbAccess.getUserData(call)
-            }
-        }
-
-        /**
-         * Set the user locally by hand
-         * @param Context The app context
-         * @param UserProfile the profile of the user
-         * @param online if false, does not store in db
-         */
-        fun setUser(ctx: Context, user: User, online: Boolean){
-            val edit = getSharedPreferences(ctx)?.edit()
-            if (edit != null) {
-                edit.putString(USERNAME, user.username)
-                edit.putString(IMAGE, user.image)
-                edit.putString(EMAIL, user.email)
-                edit.putInt(TOTAL_GAMES, user.totalGames)
-                edit.putInt(BEST_SCORE, user.bestScore)
-                edit.putInt(CORRECT_SONGS, user.correctSongs)
-                edit.putInt(RANKING, user.ranking)
-                edit.putBoolean(ONLINE, online)
-                edit.commit()
-            }
-        }
-
-        /**
-         * Update the score locally and in db (if enabled for the user)
-         * @param Context The app context
-         * @param deltaTotal how much increase the ranking
-         * @param deltaBest how much increase best_score
-         * @param deltaCorrect how much increase correct guesses song
-         * @param deltaRanking How much increase ranking
-         */
-        fun updateScore(ctx: Context, deltaTotal: Int = 0, deltaBest: Int = 0, deltaCorrect: Int = 0, deltaRanking: Int = 0){
-            val sharedPref = getSharedPreferences(ctx)
-            if(sharedPref != null){
-                val edit = sharedPref.edit()
-                val current_total_games = sharedPref.getInt(TOTAL_GAMES, 0) + deltaTotal
-                val current_best_score = sharedPref.getInt(BEST_SCORE, 0) + deltaBest
-                val current_correct_song = sharedPref.getInt(CORRECT_SONGS, 0) + deltaCorrect
-                val current_ranking = sharedPref.getInt(RANKING, 0) + deltaRanking
-                if(sharedPref.getBoolean(ONLINE, false)) {
-                    dbAccess.updateFieldInt("testUser", current_total_games, "totalGames")
-                    dbAccess.updateFieldInt("testUser", current_ranking, "ranking")
-                    dbAccess.updateFieldInt("testUser", current_correct_song, "correctSongs")
-                    dbAccess.updateFieldInt("testUser", current_best_score, "bestScore")
-                }
-                edit.putInt(TOTAL_GAMES, current_total_games)
-                edit.putInt(BEST_SCORE, current_best_score)
-                edit.putInt(CORRECT_SONGS, current_correct_song)
-                edit.putInt(RANKING, current_ranking)
-                edit.commit()
-            }
-        }
-
-        /**
-         * Update the username locally and in db (if enabled for the user)
-         * @param Context The app context
-         * @param username new username
-         */
-        fun updateUsername(ctx: Context, username: String){
-            val sharedPref = getSharedPreferences(ctx)
-            if(sharedPref != null){
-                val edit = sharedPref.edit()
-                edit.putString(USERNAME, username)
-                if(sharedPref.getBoolean(ONLINE, false)) {
-                    dbAccess.updateFieldString("testUser", username, "username")
-                }
-                edit.commit()
-            }
-        }
-
-
-        /**
-         * Getter for locally store profile
-         * @param Context The app context
-         * @return UserProfile
-         */
-        fun getUser(ctx: Context): User {
-            val sharedPref = getSharedPreferences(ctx)
-
-            var username = ""
-            var image = ""
-            var email = ""
-            var totalGames = -1
-            var bestScore = -1
-            var correctSongs = -1
-            var ranking = -1
-
-            if(sharedPref != null) {
-                username = sharedPref.getString(USERNAME, "").toString()
-                image = sharedPref.getString(IMAGE, "").toString()
-                email = sharedPref.getString(EMAIL, "").toString()
-                totalGames = sharedPref.getInt(TOTAL_GAMES, 0)
-                bestScore = sharedPref.getInt(BEST_SCORE, 0)
-                correctSongs = sharedPref.getInt(CORRECT_SONGS, 0)
-                ranking = sharedPref.getInt(RANKING, 0)
-            }
-            return User(username, image, email, totalGames, bestScore, correctSongs, ranking)
-
-        }
-
-
-    }
-}
\ No newline at end of file

From 06df4a8e7359bdaecb6b6af834b9f85efddc3aec Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 19:52:35 +0200
Subject: [PATCH 25/45] update test

---
 .../java/ch/sdp/vibester/activity/ProfileActivityTest.kt  | 2 ++
 app/src/main/java/ch/sdp/vibester/TestMode.kt             | 8 ++++++++
 .../java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index 899396c52..c1da0187d 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
@@ -88,6 +89,7 @@ class ProfileActivityTest {
 
     @Test
     fun checkEditProfile() {
+        TestMode.setTest2()
         val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
diff --git a/app/src/main/java/ch/sdp/vibester/TestMode.kt b/app/src/main/java/ch/sdp/vibester/TestMode.kt
index 11cc31361..ad7adadd5 100644
--- a/app/src/main/java/ch/sdp/vibester/TestMode.kt
+++ b/app/src/main/java/ch/sdp/vibester/TestMode.kt
@@ -12,6 +12,14 @@ class TestMode private constructor(){
             return isTest
         }
 
+        private var isTest2: Boolean = false
 
+        fun setTest2(){
+            isTest2 = true
+        }
+
+        fun isTest2(): Boolean {
+            return isTest2
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index b00923852..00330fc28 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -37,7 +37,7 @@ class FireBaseAuthenticator @Inject constructor() {
         }
 
         fun getCurrentUID(): String {
-            if (isLoggedIn() || TestMode.isTest()) {
+            if ( (isLoggedIn() || TestMode.isTest()) && !TestMode.isTest2()) {
                 return FirebaseAuth.getInstance().currentUser!!.uid
             } else {
                 return ""

From 75b8f0b3a28e5981afc055a27732935abb64725d Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 21:25:13 +0200
Subject: [PATCH 26/45] update test 2

---
 .../java/ch/sdp/vibester/activity/TypingGameActivityTest.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index 27a27857e..90e68344c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -18,6 +18,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
 import ch.sdp.vibester.model.Song
@@ -109,6 +110,7 @@ class TypingGameActivityTest {
 
     @Test
     fun guessLayoutTest() {
+        TestMode.setTest()
         val inputTxt = """
             {
                 "resultCount":1,
@@ -199,7 +201,7 @@ class TypingGameActivityTest {
     */
     @Test
     fun checkIntentOnEnding() {
-
+        TestMode.setTest()
         val inputTxt = """
             {
                 "resultCount":1,

From cea504f0664c602931472b1932379a60dc457427 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 21:50:49 +0200
Subject: [PATCH 27/45] try update

---
 .../vibester/activity/WelcomeActivityTest.kt  |  1 +
 .../sdp/vibester/activity/DownloadActivity.kt | 36 ++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index b642ebf55..53550bf5a 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -66,6 +66,7 @@ class WelcomeActivityTest {
 
     @Test
     fun checkIntentOnDownload() {
+        TestMode.setTest()
         onView(withId(R.id.welcome_download)).perform(click())
         intended(hasComponent(DownloadActivity::class.java.name))
     }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index add288a4a..8c19cfa24 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -16,6 +16,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.ItunesMusicApi
 import ch.sdp.vibester.model.Song
 import okhttp3.OkHttpClient
@@ -33,30 +34,33 @@ class DownloadActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_download)
 
+
         val songNameView = findViewById<TextView>(R.id.download_songName)
         val downloadButton = findViewById<Button>(R.id.download_downloadsong)
 
-        downloadButton.setOnClickListener {
-            songName = songNameView.text.toString()
-            val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
-            try {
-                song = Song.singleSong(songFuture.get())
-                checkPermissionsAndDownload()
-            } catch (e: IllegalArgumentException) {
-                alert("Unable to find song, please retry!", "Please retry!", songNameView)
+        if (!TestMode.isTest()) {
+            downloadButton.setOnClickListener {
+                songName = songNameView.text.toString()
+                val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
+                try {
+                    song = Song.singleSong(songFuture.get())
+                    checkPermissionsAndDownload()
+                } catch (e: IllegalArgumentException) {
+                    alert("Unable to find song, please retry!", "Please retry!", songNameView)
+                }
             }
-        }
 
-        var broadcast = object:BroadcastReceiver() {
-            override fun onReceive(context: Context?, intent: Intent?) {
-                var id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-                if(id == downloadId) {
-                    alert("Download completed!", "Try another song!", songNameView)
+            var broadcast = object : BroadcastReceiver() {
+                override fun onReceive(context: Context?, intent: Intent?) {
+                    var id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
+                    if (id == downloadId) {
+                        alert("Download completed!", "Try another song!", songNameView)
+                    }
                 }
             }
-        }
 
-        registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+            registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+        }
     }
 
     /*

From 82083fb19e2c72881d914061207b2b7ee4833c14 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 22:34:07 +0200
Subject: [PATCH 28/45] try update 2

---
 .../java/ch/sdp/vibester/activity/WelcomeActivityTest.kt        | 1 +
 app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 53550bf5a..a18ba2dcf 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -67,6 +67,7 @@ class WelcomeActivityTest {
     @Test
     fun checkIntentOnDownload() {
         TestMode.setTest()
+        TestMode.setTest2()
         onView(withId(R.id.welcome_download)).perform(click())
         intended(hasComponent(DownloadActivity::class.java.name))
     }
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index 00330fc28..0300924dd 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -29,7 +29,7 @@ class FireBaseAuthenticator @Inject constructor() {
          * API: return the mail of the user if logged in otherwise empty string
          */
         fun getCurrentUserMail(): String {
-            if (isLoggedIn() || TestMode.isTest()) {
+            if ( (isLoggedIn() || TestMode.isTest()) && !TestMode.isTest2() ) {
                 return FirebaseAuth.getInstance().currentUser!!.email.toString()
             } else {
                 return ""

From 9b8d0d3421ec9222ac72d8964e272fb115996df3 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 22:55:47 +0200
Subject: [PATCH 29/45] try update 3

---
 .../ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
index c86afcacc..075013ae9 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
@@ -11,17 +11,17 @@ class FireBaseAuthenticatorTest {
     @Test
     fun checkTestModeGetMail(){
         TestMode.setTest()
-        assertThrows(NullPointerException::class.java, {
+        assertThrows(Exception::class.java) {
             FireBaseAuthenticator.getCurrentUserMail()
-        })
+        }
     }
 
     @Test
     fun checkTestModeGetUID(){
         TestMode.setTest()
-        assertThrows(NullPointerException::class.java, {
+        assertThrows(Exception::class.java) {
             FireBaseAuthenticator.getCurrentUID()
-        })
+        }
     }
 
     @Test

From 0fdd23685f75a6a60719d2d0730b46cc4c61d294 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 23:06:16 +0200
Subject: [PATCH 30/45] try update 666

---
 .../vibester/auth/FireBaseAuthenticatorTest.kt   |  8 ++------
 .../sdp/vibester/auth/FireBaseAuthenticator.kt   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
index 075013ae9..51f44bdc5 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
@@ -11,17 +11,13 @@ class FireBaseAuthenticatorTest {
     @Test
     fun checkTestModeGetMail(){
         TestMode.setTest()
-        assertThrows(Exception::class.java) {
-            FireBaseAuthenticator.getCurrentUserMail()
-        }
+        assertEquals("", FireBaseAuthenticator.getCurrentUserMail())
     }
 
     @Test
     fun checkTestModeGetUID(){
         TestMode.setTest()
-        assertThrows(Exception::class.java) {
-            FireBaseAuthenticator.getCurrentUID()
-        }
+        assertEquals("", FireBaseAuthenticator.getCurrentUID())
     }
 
     @Test
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index 0300924dd..eadcbb516 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -29,19 +29,19 @@ class FireBaseAuthenticator @Inject constructor() {
          * API: return the mail of the user if logged in otherwise empty string
          */
         fun getCurrentUserMail(): String {
-            if ( (isLoggedIn() || TestMode.isTest()) && !TestMode.isTest2() ) {
-                return FirebaseAuth.getInstance().currentUser!!.email.toString()
-            } else {
-                return ""
+            var mail = ""
+            if (isLoggedIn()) {
+                mail = FirebaseAuth.getInstance().currentUser!!.email.toString()
             }
+            return mails
         }
 
         fun getCurrentUID(): String {
-            if ( (isLoggedIn() || TestMode.isTest()) && !TestMode.isTest2()) {
-                return FirebaseAuth.getInstance().currentUser!!.uid
-            } else {
-                return ""
+            var uid = ""
+            if (isLoggedIn()) {
+                uid = FirebaseAuth.getInstance().currentUser!!.uid
             }
+            return uid
         }
 
 

From 214c93366654a2038aece0abd915058b8160ff55 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Wed, 27 Apr 2022 23:07:05 +0200
Subject: [PATCH 31/45] try update 666 2

---
 app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index eadcbb516..94a0082d7 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -33,7 +33,7 @@ class FireBaseAuthenticator @Inject constructor() {
             if (isLoggedIn()) {
                 mail = FirebaseAuth.getInstance().currentUser!!.email.toString()
             }
-            return mails
+            return mail
         }
 
         fun getCurrentUID(): String {

From d498ddf1f9fd0484a45d4a9e60153edca4656381 Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:25:59 +0200
Subject: [PATCH 32/45] Update
 app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 .../java/ch/sdp/vibester/activity/AuthenticationActivity.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index ba7bdd4c1..c34bada5b 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -236,7 +236,7 @@ class AuthenticationActivity : AppCompatActivity() {
             }
 
             else if('@' in emailText && createAcc && user != null) { //
-                if(TestMode.isTest()){
+                if (TestMode.isTest()) {
                     startNewActivity(emailText)
                 }else{
                     dataGetter.createUser(

From ffc2d117677c1a7920559928f493d64c583837c0 Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:26:09 +0200
Subject: [PATCH 33/45] Update
 app/src/main/java/ch/sdp/vibester/api/InternetState.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/api/InternetState.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
index 52712c33b..b90b3d6f9 100644
--- a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
@@ -21,7 +21,8 @@ class InternetState private constructor(){
 
         private var hasAlreadyAccessedInternetOnce: Boolean = false
         fun hasAccessedInternetOnce(ctx: Context):Boolean{
-            if(!hasAlreadyAccessedInternetOnce&& getInternetStatus(ctx)){
+            if (!hasAlreadyAccessedInternetOnce && getInternetStatus(ctx)) {
+
                 hasAlreadyAccessedInternetOnce = true
             }
             return hasAlreadyAccessedInternetOnce

From d42d33a7b1af4eb6e02c9bfc680315b735c1bd4f Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:26:20 +0200
Subject: [PATCH 34/45] Update
 app/src/main/java/ch/sdp/vibester/api/InternetState.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/api/InternetState.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
index b90b3d6f9..5ae1b77bd 100644
--- a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
@@ -12,7 +12,8 @@ class InternetState private constructor(){
         fun getInternetStatus(ctx: Context): Boolean{
             val connectivityManager = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
             val networkInfo = connectivityManager.activeNetworkInfo
-            var isNetwork:Boolean = false
+            var isNetwork: Boolean = false
+
             if(networkInfo != null){
                 isNetwork = networkInfo.isConnected
             }

From 56fbdd0306d9bc8cccdd8350de3f63490520352f Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:26:39 +0200
Subject: [PATCH 35/45] Update
 app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 .../java/ch/sdp/vibester/activity/AuthenticationActivity.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index c34bada5b..fc084bf01 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -124,7 +124,7 @@ class AuthenticationActivity : AppCompatActivity() {
                     // Sign in success, update UI with the signed-in user's information
                     Log.d(getString(R.string.log_tag), "signInWithCredential:success")
                     var createAcc: Boolean = false
-                    if(task.getResult().additionalUserInfo != null){
+                    if (task.getResult().additionalUserInfo != null) {
                         createAcc = task.getResult().additionalUserInfo!!.isNewUser
                     }
                     val user = auth.currentUser

From 2864d98605cdd24f919a39a68809569d13b817b8 Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:26:57 +0200
Subject: [PATCH 36/45] Update
 app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 .../main/java/ch/sdp/vibester/activity/GameEndingActivity.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index c4a87c08f..0c18f6f7a 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -41,7 +41,7 @@ class GameEndingActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_game_ending_screen)
 
-        //Method to update score (locally and on DB)
+        
 
 
         if (intent.hasExtra("Winner Name")) {

From 4402f27fe1d331bc0c45dc65e91a22fba59d3c7c Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:27:38 +0200
Subject: [PATCH 37/45] Update
 app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 87bf6eb1f..6ffa22593 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -64,7 +64,8 @@ class ProfileActivity : AppCompatActivity() {
 
         // Do not enable querying database while executing unit test
         val isUnitTest: Boolean = intent.getBooleanExtra("isUnitTest", false)
-        if(!isUnitTest){
+        if (!isUnitTest) {
+
             queryDatabase()
         }else{
             var upTest: User? = intent.getSerializableExtra("userTestProfile") as User?

From 19d620660a487966773c277754a0e5e93c95a886 Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:28:02 +0200
Subject: [PATCH 38/45] Update
 app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 6ffa22593..713843d9d 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -67,7 +67,8 @@ class ProfileActivity : AppCompatActivity() {
         if (!isUnitTest) {
 
             queryDatabase()
-        }else{
+        } else {
+
             var upTest: User? = intent.getSerializableExtra("userTestProfile") as User?
             if (upTest == null) {
                 setupProfile(User())

From 3d3b9672a2e81f6013f0f7428b522c13ac7ebd67 Mon Sep 17 00:00:00 2001
From: Maxime <61186830+MaximeZmt@users.noreply.github.com>
Date: Thu, 28 Apr 2022 09:30:02 +0200
Subject: [PATCH 39/45] Update
 app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt

Co-authored-by: jiabaow <60721007+jiabaow@users.noreply.github.com>
---
 app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 713843d9d..19aeae8e0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -72,7 +72,8 @@ class ProfileActivity : AppCompatActivity() {
             var upTest: User? = intent.getSerializableExtra("userTestProfile") as User?
             if (upTest == null) {
                 setupProfile(User())
-            }else{
+            } else {
+
                 setupProfile(upTest)
             }
         }

From 74f41bd3de4ed874ce007ee24f4e04bf5c6ae302 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 28 Apr 2022 09:41:42 +0200
Subject: [PATCH 40/45] review updated

---
 .../vibester/activity/ProfileActivityTest.kt  |  1 -
 .../vibester/activity/WelcomeActivityTest.kt  |  1 -
 .../vibester/helper/AllPurposeFunctionTest.kt | 15 +++++++++++++
 app/src/main/java/ch/sdp/vibester/TestMode.kt | 21 ++++++++++---------
 .../activity/AuthenticationActivity.kt        | 14 ++++++-------
 .../vibester/auth/FireBaseAuthenticator.kt    |  4 +++-
 .../ch/sdp/vibester/database/DataGetter.kt    |  1 -
 .../ch/sdp/vibester/database/DbUserIdStore.kt | 15 -------------
 8 files changed, 35 insertions(+), 37 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt
 delete mode 100644 app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index c1da0187d..e07ddebdd 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -89,7 +89,6 @@ class ProfileActivityTest {
 
     @Test
     fun checkEditProfile() {
-        TestMode.setTest2()
         val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index a18ba2dcf..53550bf5a 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -67,7 +67,6 @@ class WelcomeActivityTest {
     @Test
     fun checkIntentOnDownload() {
         TestMode.setTest()
-        TestMode.setTest2()
         onView(withId(R.id.welcome_download)).perform(click())
         intended(hasComponent(DownloadActivity::class.java.name))
     }
diff --git a/app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt b/app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt
new file mode 100644
index 000000000..682bdce15
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt
@@ -0,0 +1,15 @@
+package ch.sdp.vibester.helper
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class AllPurposeFunctionTest {
+
+    @Test
+    fun testBiggerInt(){
+        val i1 = 1
+        val i2 = 2
+        assertEquals(i2, AllPurposeFunction.biggerInt(i1, i2))
+        assertEquals(i2, AllPurposeFunction.biggerInt(i2, i1))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/TestMode.kt b/app/src/main/java/ch/sdp/vibester/TestMode.kt
index ad7adadd5..098889896 100644
--- a/app/src/main/java/ch/sdp/vibester/TestMode.kt
+++ b/app/src/main/java/ch/sdp/vibester/TestMode.kt
@@ -1,25 +1,26 @@
 package ch.sdp.vibester
 
+
+/**
+ * This class represent a state manager that can be used in unit test
+ * It may be used to disable certain features for unit test
+ */
 class TestMode private constructor(){
     companion object{
         private var isTest: Boolean = false
 
+        /**
+         * Setter for IsTest()
+         */
         fun setTest(){
             isTest = true
         }
 
+        /**
+         * Is Test enabled
+         */
         fun isTest(): Boolean {
             return isTest
         }
-
-        private var isTest2: Boolean = false
-
-        fun setTest2(){
-            isTest2 = true
-        }
-
-        fun isTest2(): Boolean {
-            return isTest2
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index ba7bdd4c1..8bcb0d890 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -32,6 +32,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class AuthenticationActivity : AppCompatActivity() {
+    private val AUTHENTICATION_PERMISSION_CODE = 1000
 
     private lateinit var googleSignInClient: GoogleSignInClient
 
@@ -51,8 +52,10 @@ class AuthenticationActivity : AppCompatActivity() {
         supportActionBar?.hide()
         setContentView(R.layout.activity_authentication)
 
+        val googleSignInToken = "7687769601-qiqrp6kt48v89ub76k9lkpefh9ls36ha.apps.googleusercontent.com"
+
         val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-            .requestIdToken("7687769601-qiqrp6kt48v89ub76k9lkpefh9ls36ha.apps.googleusercontent.com")
+            .requestIdToken(googleSignInToken)
             .requestEmail()
             .build()
 
@@ -102,7 +105,7 @@ class AuthenticationActivity : AppCompatActivity() {
      */
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == 1000) {
+        if (requestCode == AUTHENTICATION_PERMISSION_CODE) {
             val task = GoogleSignIn.getSignedInAccountFromIntent(data)
             try {
                 val account = task.getResult(ApiException::class.java)!!
@@ -239,12 +242,7 @@ class AuthenticationActivity : AppCompatActivity() {
                 if(TestMode.isTest()){
                     startNewActivity(emailText)
                 }else{
-                    dataGetter.createUser(
-                        emailText,
-                        user.uid,
-                        this::startNewActivity,
-                        user.uid
-                    )
+                    dataGetter.createUser(emailText, user.uid, this::startNewActivity, user.uid)
                 }
             }
 
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index 94a0082d7..4c9332cec 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -17,6 +17,7 @@ import javax.inject.Inject
 
 class FireBaseAuthenticator @Inject constructor() {
     companion object{
+        private val AUTHENTICATION_PERMISSION_CODE = 1000
 
         /**
          * API: return true if firebase authentication is logged in
@@ -50,9 +51,10 @@ class FireBaseAuthenticator @Inject constructor() {
          * @param requestCode a request code
          * @param resultCode a result code
          * @param data intent returned from google sign in
+         * @param ctx current app context
          */
         fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?, ctx: Context): String? {
-            if (requestCode == 1000) {
+            if (requestCode == AUTHENTICATION_PERMISSION_CODE) {
                 try {
                     val account = GoogleSignIn.getSignedInAccountFromIntent(data).result
                     val client = Identity.getSignInClient(ctx)
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 6ad105788..236607f01 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -162,7 +162,6 @@ class DataGetter @Inject constructor() {
                     val dbContents = dataSnapShot.getValue<User>()
                     if (dbContents != null) {
                         if(FireBaseAuthenticator.isLoggedIn() && dbContents.email == FireBaseAuthenticator.getCurrentUserMail()) {
-                            DbUserIdStore.storeUID(dataSnapShot.key!!)
                             callback(dbContents)
                             break
                         }
diff --git a/app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt b/app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt
deleted file mode 100644
index 38570e7ee..000000000
--- a/app/src/main/java/ch/sdp/vibester/database/DbUserIdStore.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package ch.sdp.vibester.database
-
-class DbUserIdStore private constructor(){
-    companion object{
-        private var uid: String = ""
-        fun storeUID(uid: String){
-            this.uid = uid
-        }
-
-        fun getUID(): String{
-            return uid
-        }
-
-    }
-}
\ No newline at end of file

From 713f86568cbb46bc6291b34417de8ca743107e64 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 28 Apr 2022 09:42:44 +0200
Subject: [PATCH 41/45] review updated 2

---
 .../java/ch/sdp/vibester/activity/AuthenticationActivity.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index f048d843d..eab540b55 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -191,7 +191,7 @@ class AuthenticationActivity : AppCompatActivity() {
      */
     private fun signInGoogle() {
         val intent = googleSignInClient.signInIntent
-        startActivityForResult(intent, 1000)
+        startActivityForResult(intent, AUTHENTICATION_PERMISSION_CODE)
     }
 
     /**

From e10f9c56b713c1ddcf7f4e46c6674e4076bbafce Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 28 Apr 2022 16:44:08 +0200
Subject: [PATCH 42/45] all issues addressed

---
 .../vibester/helper/AllPurposeFunctionTest.kt | 15 ------------
 .../activity/AuthenticationActivity.kt        |  1 -
 .../vibester/activity/GameSetupActivity.kt    |  3 ---
 .../sdp/vibester/activity/ProfileActivity.kt  |  3 +--
 .../java/ch/sdp/vibester/api/InternetState.kt |  2 +-
 .../vibester/auth/FireBaseAuthenticator.kt    |  8 ++++---
 .../ch/sdp/vibester/database/DataGetter.kt    | 23 +++++++------------
 .../java/ch/sdp/vibester/database/Database.kt |  3 +--
 .../vibester/database/PersistanceSetter.kt    | 13 ++++++++++-
 .../sdp/vibester/helper/AllPurposeFunction.kt | 20 ----------------
 10 files changed, 28 insertions(+), 63 deletions(-)
 delete mode 100644 app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt
 delete mode 100644 app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt b/app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt
deleted file mode 100644
index 682bdce15..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/helper/AllPurposeFunctionTest.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package ch.sdp.vibester.helper
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class AllPurposeFunctionTest {
-
-    @Test
-    fun testBiggerInt(){
-        val i1 = 1
-        val i2 = 2
-        assertEquals(i2, AllPurposeFunction.biggerInt(i1, i2))
-        assertEquals(i2, AllPurposeFunction.biggerInt(i2, i1))
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index eab540b55..4355466b0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -218,7 +218,6 @@ class AuthenticationActivity : AppCompatActivity() {
     }
 
 
-//TODO
     private fun startNewActivity(email: String) {
         val newIntent = Intent(this, CreateProfileActivity::class.java)
         newIntent.putExtra("email", email)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
index 374f49138..97ccf0ede 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
@@ -43,15 +43,12 @@ class GameSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListene
 
         retButton.setOnClickListener {
             if(findViewById<LinearLayout>(R.id.chooseGame).visibility == VISIBLE){
-                Log.e("MENU LOGIC", "should return menu")
                 IntentSwitcher.switchBackToWelcome(this)
                 finish()
             }else if (findViewById<ConstraintLayout>(R.id.chooseGenre).visibility == VISIBLE){
-                Log.e("MENU LOGIC", "back to choose game")
                 findViewById<LinearLayout>(R.id.chooseGame).visibility = VISIBLE
                 findViewById<ConstraintLayout>(R.id.chooseGenre).visibility = GONE
             }else if (findViewById<ConstraintLayout>(R.id.chooseDifficulty).visibility == VISIBLE){
-                Log.e("MENU LOGIC", "back to choose genre")
                 findViewById<ConstraintLayout>(R.id.chooseGenre).visibility = VISIBLE
                 findViewById<ConstraintLayout>(R.id.chooseDifficulty).visibility = GONE
             }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 19aeae8e0..85d79b702 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -64,11 +64,10 @@ class ProfileActivity : AppCompatActivity() {
 
         // Do not enable querying database while executing unit test
         val isUnitTest: Boolean = intent.getBooleanExtra("isUnitTest", false)
-        if (!isUnitTest) {
 
+        if (!isUnitTest) {
             queryDatabase()
         } else {
-
             var upTest: User? = intent.getSerializableExtra("userTestProfile") as User?
             if (upTest == null) {
                 setupProfile(User())
diff --git a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
index 5ae1b77bd..e0f481c59 100644
--- a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
@@ -6,7 +6,7 @@ import android.net.ConnectivityManager
 class InternetState private constructor(){
     companion object{
         /**
-         * Get Internet Connexion Status
+         * Get Internet Connection Status
          * @return return true if connected; false otherwise
          */
         fun getInternetStatus(ctx: Context): Boolean{
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index 4c9332cec..cc5d4a24a 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -3,7 +3,6 @@ package ch.sdp.vibester.auth
 
 import android.content.Context
 import android.content.Intent
-import ch.sdp.vibester.TestMode
 import com.google.android.gms.auth.api.identity.Identity
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.tasks.Task
@@ -37,6 +36,9 @@ class FireBaseAuthenticator @Inject constructor() {
             return mail
         }
 
+        /**
+         * API: return the uid of the user if logged in otherwise empty string
+         */
         fun getCurrentUID(): String {
             var uid = ""
             if (isLoggedIn()) {
@@ -59,8 +61,8 @@ class FireBaseAuthenticator @Inject constructor() {
                     val account = GoogleSignIn.getSignedInAccountFromIntent(data).result
                     val client = Identity.getSignInClient(ctx)
                     val idToken = client.getSignInCredentialFromIntent(data).googleIdToken
-                    val ficred = GoogleAuthProvider.getCredential(idToken, null)
-                    FirebaseAuth.getInstance().signInWithCredential(ficred)
+                    val credential = GoogleAuthProvider.getCredential(idToken, null)
+                    FirebaseAuth.getInstance().signInWithCredential(credential)
                     return account.email
                 } catch (e: Exception) {
                     return "Authentication error"
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 236607f01..8c7ce8ca7 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -4,7 +4,6 @@ import android.content.ContentValues
 import android.util.Log
 import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.helper.AllPurposeFunction
 import ch.sdp.vibester.user.User
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
@@ -54,13 +53,10 @@ class DataGetter @Inject constructor() {
      */
     fun updateRelativeFieldInt(userID: String, newVal: Int, fieldName: String) {
         if(!TestMode.isTest()) {
-            dbRef.child(userID)
-                .child(fieldName)
+            dbRef.child(userID).child(fieldName)
                 .get().addOnSuccessListener { t ->
                     if(!TestMode.isTest()) {
-                        dbRef.child(userID)
-                            .child(fieldName)
-                            .setValue((t.value as Long?)!!.toInt() + newVal)
+                        updateFieldInt(userID, (t.value as Long?)!!.toInt() + newVal, fieldName)
                     }
                 }
         }
@@ -74,13 +70,10 @@ class DataGetter @Inject constructor() {
      */
     fun updateBestFieldInt(userID: String, newVal: Int, fieldName: String) {
         if(!TestMode.isTest()) {
-            dbRef.child(userID)
-                .child(fieldName)
+            dbRef.child(userID).child(fieldName)
                 .get().addOnSuccessListener { t ->
                     if(!TestMode.isTest()) {
-                        dbRef.child(userID)
-                            .child(fieldName)
-                            .setValue(AllPurposeFunction.biggerInt((t.value as Long?)!!.toInt(), newVal))
+                        updateFieldInt(userID, maxOf((t.value as Long?)!!.toInt(), newVal), fieldName)
                     }
                 }
         }
@@ -106,10 +99,11 @@ class DataGetter @Inject constructor() {
      * @param email the email of the new user
      * @param username the username of the new user
      * @param callback function to be called when the the user has been created
+     * @param uid id of the new user
      */
-    fun createUser(email: String, username: String, callback: (String) -> Unit, newId: String) {
-        var newUser = User(username, "", email, 0, 0, 0, 0, newId)
-        dbRef.child(newId).setValue(newUser)
+    fun createUser(email: String, username: String, callback: (String) -> Unit, uid: String) {
+        var newUser = User(username, "", email, 0, 0, 0, 0, uid)
+        dbRef.child(uid).setValue(newUser)
             .addOnSuccessListener {
                 callback(email)
             }
@@ -152,7 +146,6 @@ class DataGetter @Inject constructor() {
 
     /**
      * This functions fetches the data of the given user from the database
-     * @param email the of the user
      * @param callback the function to be called when the data of the appropriate user is available
      */
     fun getUserData(callback: (User) -> Unit) {
diff --git a/app/src/main/java/ch/sdp/vibester/database/Database.kt b/app/src/main/java/ch/sdp/vibester/database/Database.kt
index 9c813a41b..13a5763e8 100644
--- a/app/src/main/java/ch/sdp/vibester/database/Database.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/Database.kt
@@ -7,9 +7,8 @@ import com.google.firebase.ktx.Firebase
 /**
  * The Database objects that returns our database instance
  */
-
 object Database {
     fun get(): FirebaseDatabase {
-        return  Firebase.database("https://vibester-sdp-default-rtdb.europe-west1.firebasedatabase.app")
+        return Firebase.database("https://vibester-sdp-default-rtdb.europe-west1.firebasedatabase.app")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt b/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt
index e6ffe6c71..659c15d74 100644
--- a/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt
@@ -3,17 +3,28 @@ package ch.sdp.vibester.database
 import com.google.firebase.database.ktx.database
 import com.google.firebase.ktx.Firebase
 
+/**
+ * Enable Persistance in Firebase database.
+ * If internet connection is lost while app is on, it continues to work
+ */
 class PersistanceSetter private constructor(){
     companion object{
         private var alreadyExecuted : Boolean = false
 
+        /**
+         * Turn on the persistance
+         */
         fun setPersistance(){
-            if (!alreadyExecuted){
+            if (!alreadyExecuted) {
                 Firebase.database.setPersistenceEnabled(true)
                 alreadyExecuted = true
             }
         }
 
+        /**
+         * Getter to check whether it has been turned on
+         * @return Boolean
+         */
         fun getPersistance(): Boolean{
             return alreadyExecuted
         }
diff --git a/app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt b/app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt
deleted file mode 100644
index 31b24639b..000000000
--- a/app/src/main/java/ch/sdp/vibester/helper/AllPurposeFunction.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package ch.sdp.vibester.helper
-
-class AllPurposeFunction private constructor(){
-    companion object{
-
-        /**
-         * Functions that return the biggest value between the two given in argument
-         * @param i1 first int value to be compared
-         * @param i2 second int value to be compared
-         * @return The biggest Int
-         */
-        fun biggerInt(i1: Int, i2: Int): Int{
-            if (i1 > i2){
-                return i1
-            }else{
-                return i2
-            }
-        }
-    }
-}
\ No newline at end of file

From 5b3c21f5326edb3008e8cc869bcbca420452c887 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 28 Apr 2022 18:34:37 +0200
Subject: [PATCH 43/45] some other issues addressed

---
 .../java/ch/sdp/vibester/UtilTest.kt          | 17 -----------------
 .../activity/BuzzerScreenActivityTest.kt      |  2 --
 .../activity/CreateProfileActivityTest.kt     |  1 +
 .../activity/GameEndingActivityTest.kt        |  2 --
 .../vibester/activity/ProfileActivityTest.kt  |  2 ++
 .../vibester/activity/WelcomeActivityTest.kt  |  3 +--
 .../activity/CreateProfileActivity.kt         |  4 ++--
 .../sdp/vibester/activity/ProfileActivity.kt  |  1 -
 .../java/ch/sdp/vibester/api/InternetState.kt |  1 -
 .../main/java/ch/sdp/vibester/util/Util.kt    | 19 -------------------
 10 files changed, 6 insertions(+), 46 deletions(-)
 delete mode 100644 app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
 delete mode 100644 app/src/main/java/ch/sdp/vibester/util/Util.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt b/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
deleted file mode 100644
index 9a64f8698..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package ch.sdp.vibester
-
-import ch.sdp.vibester.util.Util
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class UtilTest {
-    @Test
-    fun newIdIsCorrectLength() {
-        assertEquals(Util.createNewId().length, 10)
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
index 956144ca8..be87a7a8c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
@@ -101,8 +101,6 @@ class BuzzerScreenActivityTest {
      */
     @Test
     fun checkIntentOnEnding() {
-        TestMode.setTest()
-
         val mockArray = arrayListOf<String>("One", "Two", "Three", "Four", "Five")
 
         val incArray: ArrayList<String> = mockArray
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index fe2899e69..eadeffe9b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -49,6 +49,7 @@ class CreateProfileActivityTest {
         every { mockUsersRepo.getUserData(any()) } answers {
             secondArg<(User) -> Unit>().invoke(User())
         }
+
     }
 
     @After
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index eb3772971..6de9594fa 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -47,8 +47,6 @@ class GameEndingActivityTest {
 
     @Test
     fun checkIntentOnCalled() {
-        TestMode.setTest()
-
         incArray.addAll(arrayOf("One", "Two", "Three"))
         statNames.addAll(
             arrayOf(
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index e07ddebdd..e7a6d8c7c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -50,6 +50,8 @@ class ProfileActivityTest {
             secondArg<(User) -> Unit>().invoke(mockProfile)
         }
         every { mockUsersRepo.updateFieldString(any(), any(), any()) } answers {}
+
+        every { mockUsersRepo.getUserData(any())} answers {}
     }
 
     @After
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 53550bf5a..c926c73b0 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -66,14 +66,13 @@ class WelcomeActivityTest {
 
     @Test
     fun checkIntentOnDownload() {
-        TestMode.setTest()
         onView(withId(R.id.welcome_download)).perform(click())
         intended(hasComponent(DownloadActivity::class.java.name))
     }
 
     @Test
     fun checkIntentOnSearch() {
-        TestMode.setTest()
+        //TestMode.setTest()
         onView(withId(R.id.welcome_search)).perform(click())
         intended(hasComponent(SearchUserActivity::class.java.name))
     }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
index 85baffb8e..2f0ca72cc 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -12,7 +12,6 @@ import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageRepo
-import ch.sdp.vibester.util.Util
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -73,10 +72,11 @@ class CreateProfileActivity : AppCompatActivity() {
     }
 
 
+    //check the UID here not sure
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE){
-            imageRepo.uploadFile("profileImg/${Util.createNewId()}", data?.data!!) { updateUI() }
+            imageRepo.uploadFile("profileImg/${FireBaseAuthenticator.getCurrentUID()}", data?.data!!) { updateUI() }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 85d79b702..303b81256 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -72,7 +72,6 @@ class ProfileActivity : AppCompatActivity() {
             if (upTest == null) {
                 setupProfile(User())
             } else {
-
                 setupProfile(upTest)
             }
         }
diff --git a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
index e0f481c59..b37967626 100644
--- a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
@@ -23,7 +23,6 @@ class InternetState private constructor(){
         private var hasAlreadyAccessedInternetOnce: Boolean = false
         fun hasAccessedInternetOnce(ctx: Context):Boolean{
             if (!hasAlreadyAccessedInternetOnce && getInternetStatus(ctx)) {
-
                 hasAlreadyAccessedInternetOnce = true
             }
             return hasAlreadyAccessedInternetOnce
diff --git a/app/src/main/java/ch/sdp/vibester/util/Util.kt b/app/src/main/java/ch/sdp/vibester/util/Util.kt
deleted file mode 100644
index e2057df6e..000000000
--- a/app/src/main/java/ch/sdp/vibester/util/Util.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package ch.sdp.vibester.util
-
-class Util {
-    companion object {
-        /**
-         * A function that generates a random ID for database storage
-         */
-        fun createNewId(): String {
-            val charPool : List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
-            val newId = (1..10)
-                .map { i -> kotlin.random.Random.nextInt(0, charPool.size) }
-                .map(charPool::get)
-                .joinToString("");
-
-            return newId
-        }
-    }
-
-}
\ No newline at end of file

From ec89e32aa09291a0a28a2ea26b8aec79586a4481 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 28 Apr 2022 18:44:38 +0200
Subject: [PATCH 44/45] renable a TestMode

---
 .../java/ch/sdp/vibester/activity/WelcomeActivityTest.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index c926c73b0..b642ebf55 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -72,7 +72,7 @@ class WelcomeActivityTest {
 
     @Test
     fun checkIntentOnSearch() {
-        //TestMode.setTest()
+        TestMode.setTest()
         onView(withId(R.id.welcome_search)).perform(click())
         intended(hasComponent(SearchUserActivity::class.java.name))
     }

From 8e559fc3f4df38433b5aa813a73cfd76a43ae143 Mon Sep 17 00:00:00 2001
From: "maxime.zammit" <maxime.zammit@epfl.ch>
Date: Thu, 28 Apr 2022 19:11:06 +0200
Subject: [PATCH 45/45] renable a TestMode 2

---
 .../java/ch/sdp/vibester/activity/TypingGameActivityTest.kt      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index 90e68344c..3065522af 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -276,6 +276,7 @@ class TypingGameActivityTest {
 
     @Test
     fun nextButtonOnClick(){
+        TestMode.setTest()
         val gameManager = setGameManager(2)
         assertEquals(gameManager.getSongList().size, 2)