From 255a5d19763be81abe927389d13cff6f77a79e71 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 19:34:27 +0200
Subject: [PATCH 1/7] Added reset password

---
 .../sdp/vibester/activity/AuthenticationActivity.kt   |  9 +++++++++
 app/src/main/res/layout/activity_authentication.xml   | 11 +++++++++++
 app/src/main/res/values/strings.xml                   |  1 +
 3 files changed, 21 insertions(+)

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 e1f21d575..708576cf4 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -94,6 +94,15 @@ class AuthenticationActivity : AppCompatActivity() {
         signInGoogle()
     }
 
+    fun resetPasswordListener(view: View) {
+        resetPassword(username.text.toString())
+    }
+
+    fun resetPassword(email: String) {
+        auth.sendPasswordResetEmail(email).addOnSuccessListener {
+        }
+    }
+
     /**
      * Listener bound to the red return button in the Authentication activity.
      */
diff --git a/app/src/main/res/layout/activity_authentication.xml b/app/src/main/res/layout/activity_authentication.xml
index 6847d06cf..3b0f8f5f0 100644
--- a/app/src/main/res/layout/activity_authentication.xml
+++ b/app/src/main/res/layout/activity_authentication.xml
@@ -132,6 +132,17 @@
                 android:text="@string/authentication_createAcc"
                 android:translationZ="10dp" />
 
+            <Button
+                android:id="@+id/forgotPassword"
+                android:layout_width="205dp"
+                android:layout_height="48dp"
+                android:backgroundTint="@color/cg_blue"
+                android:elevation="10dp"
+                android:onClick="resetPasswordListener"
+                android:stateListAnimator="@null"
+                android:text="@string/authentication_forgotPassword"
+                android:translationZ="10dp" />
+
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 895ab83e7..67128a27e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="authentication_createAcc">Create Account</string>
     <string name="authentication_logIn">Log in</string>
     <string name="authentication_googleLogIn">Log in with Google</string>
+    <string name="authentication_forgotPassword">Forgot Password</string>
     <string name="authentication_emptyField">Empty email or password</string>
     <string name="authentication_notAnEmail">Not an email</string>
     <string name="authentication_shortPassword">Password has to be at least 6 symbols</string>

From 425a0202cf997ceeb856d4d2c56af6b166118d9f Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 22:18:49 +0200
Subject: [PATCH 2/7] Added failure listener

---
 .../sdp/vibester/activity/AuthenticationActivityTest.kt  | 9 +++++++++
 .../ch/sdp/vibester/activity/AuthenticationActivity.kt   | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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 db5a53e88..d2df26130 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -195,4 +195,13 @@ class AuthenticationActivityTest {
         Intents.intended(IntentMatchers.hasComponent(MyProfileActivity::class.java.name))
     }
 
+    @Test
+    fun correctResetPassword() {
+        val email = "incorrectEmail"
+
+        onView(withId(R.id.username)).perform(ViewActions.typeText(email), closeSoftKeyboard())
+        onView(withId(R.id.forgotPassword)).perform(click())
+
+    }
+
 }
\ 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 708576cf4..165dd20c3 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -99,7 +99,8 @@ class AuthenticationActivity : AppCompatActivity() {
     }
 
     fun resetPassword(email: String) {
-        auth.sendPasswordResetEmail(email).addOnSuccessListener {
+        auth.sendPasswordResetEmail(email).addOnFailureListener {
+            Toast.makeText(applicationContext, "Couldn't send password recovery email", Toast.LENGTH_LONG)
         }
     }
 

From 043b8e7cebf930ebd7c1bf4c865a4f68bbddac44 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 22:23:06 +0200
Subject: [PATCH 3/7] Made the function private

---
 .../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 165dd20c3..8776e1d67 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -98,7 +98,7 @@ class AuthenticationActivity : AppCompatActivity() {
         resetPassword(username.text.toString())
     }
 
-    fun resetPassword(email: String) {
+    private fun resetPassword(email: String) {
         auth.sendPasswordResetEmail(email).addOnFailureListener {
             Toast.makeText(applicationContext, "Couldn't send password recovery email", Toast.LENGTH_LONG)
         }

From 9576617c58d91b979302e978b26f663ec95f8d94 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 22:26:08 +0200
Subject: [PATCH 4/7] Deleted listener

---
 .../java/ch/sdp/vibester/activity/AuthenticationActivity.kt   | 4 +---
 1 file changed, 1 insertion(+), 3 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 8776e1d67..50a7b5cd6 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -99,9 +99,7 @@ class AuthenticationActivity : AppCompatActivity() {
     }
 
     private fun resetPassword(email: String) {
-        auth.sendPasswordResetEmail(email).addOnFailureListener {
-            Toast.makeText(applicationContext, "Couldn't send password recovery email", Toast.LENGTH_LONG)
-        }
+        auth.sendPasswordResetEmail(email)
     }
 
     /**

From 2ad6ecc9adccf80394de6959135c657ae0ec874f Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 22:30:19 +0200
Subject: [PATCH 5/7] Added toast

---
 .../vibester/activity/AuthenticationActivity.kt | 17 +++++++++++++----
 app/src/main/res/values/strings.xml             |  1 +
 2 files changed, 14 insertions(+), 4 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 50a7b5cd6..2cd314b65 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -94,14 +94,13 @@ class AuthenticationActivity : AppCompatActivity() {
         signInGoogle()
     }
 
+    /**
+     * Listener bound to the "Reset Password" button in the Authentication activity.
+     */
     fun resetPasswordListener(view: View) {
         resetPassword(username.text.toString())
     }
 
-    private fun resetPassword(email: String) {
-        auth.sendPasswordResetEmail(email)
-    }
-
     /**
      * Listener bound to the red return button in the Authentication activity.
      */
@@ -257,5 +256,15 @@ class AuthenticationActivity : AppCompatActivity() {
     private fun updateOnFail(text: String = "Authentication failed"){
         Toast.makeText(baseContext, text, Toast.LENGTH_SHORT).show()
     }
+
+    /**
+     *  Reset Password function
+     *  @param email email adress for the password reset
+     */
+    private fun resetPassword(email: String) {
+        auth.sendPasswordResetEmail(email).addOnFailureListener {
+            Toast.makeText(baseContext, R.string.authentication_forgotPassword, Toast.LENGTH_SHORT).show()
+        }
+    }
     
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 44e829129..a94a7b9b9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="authentication_emptyField">Empty email or password</string>
     <string name="authentication_notAnEmail">Not an email</string>
     <string name="authentication_shortPassword">Password has to be at least 6 symbols</string>
+    <string name="authentication_resetPasswordError">Failed to send password recovery email</string>
 
     <!-- QrScanning -->
     <string name="qrScanning_scannerClosed">Scanner has been closed</string>

From 167cde159b592e313e2fd072d0f15851a77fa67f Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Thu, 26 May 2022 22:35:53 +0200
Subject: [PATCH 6/7] Deleted tests

---
 .../sdp/vibester/activity/AuthenticationActivityTest.kt  | 9 ---------
 1 file changed, 9 deletions(-)

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 d2df26130..db5a53e88 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -195,13 +195,4 @@ class AuthenticationActivityTest {
         Intents.intended(IntentMatchers.hasComponent(MyProfileActivity::class.java.name))
     }
 
-    @Test
-    fun correctResetPassword() {
-        val email = "incorrectEmail"
-
-        onView(withId(R.id.username)).perform(ViewActions.typeText(email), closeSoftKeyboard())
-        onView(withId(R.id.forgotPassword)).perform(click())
-
-    }
-
 }
\ No newline at end of file

From 7b0f939729d73c225382d84f8b33e05c277b57c2 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Fri, 27 May 2022 00:26:30 +0200
Subject: [PATCH 7/7] Fixing CI tests

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

diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index 4aa8c7cfc..7c22c8aaf 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -46,7 +46,7 @@ class PartyRoomActivityTest {
     val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(partyRoom: PartyRoom, songList: MutableList<Pair<String, String>>, startGame: Boolean, roomID: String) {
-        every {mockUsersRepo.createRoom(any())} answers {
+        every { mockUsersRepo.createRoom(any()) } answers {
             firstArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, roomID)
         }