From 7a08106abe22538fcc06bf9e4d7e09e468a92a15 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Wed, 13 Apr 2022 21:02:24 +0200
Subject: [PATCH 1/6] Started to work on image upload

---
 .../activity/CreateProfileActivity.kt         | 27 +++++++++++++++++++
 .../res/layout/activity_create_profile.xml    | 14 ++++++++++
 2 files changed, 41 insertions(+)

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..ad5e1c612 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -1,10 +1,13 @@
 package ch.sdp.vibester.activity
 
+import android.app.Activity
 import android.content.Intent
+import android.graphics.drawable.BitmapDrawable
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
+import android.widget.ImageView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.UsersRepo
 import dagger.hilt.android.AndroidEntryPoint
@@ -16,6 +19,8 @@ class CreateProfileActivity : AppCompatActivity() {
     @Inject
     lateinit var usersRepo: UsersRepo
 
+    private val REQUEST_CODE = 500
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_create_profile)
@@ -25,6 +30,8 @@ class CreateProfileActivity : AppCompatActivity() {
         var handle = findViewById<EditText>(R.id.accountHandle)
 
         val btCreateAcc = findViewById<Button>(R.id.createButton)
+        val btnUploadImg = findViewById<Button>(R.id.uploadImg)
+
 
         btCreateAcc.setOnClickListener {
             usersRepo.createUser(
@@ -33,6 +40,10 @@ class CreateProfileActivity : AppCompatActivity() {
                 handle.text.toString(),
                 this::startNewActivity)
         }
+
+        btnUploadImg.setOnClickListener {
+            uploadImage()
+        }
     }
 
     private fun startNewActivity(email: String) {
@@ -41,4 +52,20 @@ class CreateProfileActivity : AppCompatActivity() {
 
         startActivity(newIntent)
     }
+
+    private fun uploadImage() {
+        val intent = Intent(Intent.ACTION_PICK)
+        intent.type = "image/*"
+        startActivityForResult(intent, REQUEST_CODE)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        var image : ImageView = ImageView(this)
+        if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE){
+            image.setImageURI(data?.data)
+            var bitmap = (image.drawable as BitmapDrawable).bitmap
+
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_profile.xml b/app/src/main/res/layout/activity_create_profile.xml
index 64b83a55b..ba3641383 100644
--- a/app/src/main/res/layout/activity_create_profile.xml
+++ b/app/src/main/res/layout/activity_create_profile.xml
@@ -63,4 +63,18 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/accountHandle" />
+
+    <Button
+        android:id="@+id/uploadImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="116dp"
+        android:layout_marginBottom="148dp"
+        android:backgroundTint="@color/cg_blue"
+        android:text="Upload Image"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/accountHandle" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 9f37236c1570873c206f8835a74a096de5954ef8 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Sun, 17 Apr 2022 14:17:09 +0200
Subject: [PATCH 2/6] Added image upload to firebase

---
 app/build.gradle                              |  1 +
 .../activity/CreateProfileActivity.kt         | 27 ++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9307e6a9d..2abbccbd5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,6 +80,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.0.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.0.0'
     implementation 'com.google.firebase:firebase-database-ktx'
+    implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'junit:junit:4.13.2'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.json:json:20180813'
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 ad5e1c612..e9b6fd915 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.activity
 import android.app.Activity
 import android.content.Intent
 import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
@@ -10,7 +11,12 @@ import android.widget.EditText
 import android.widget.ImageView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.UsersRepo
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.StorageReference
+import com.google.firebase.storage.ktx.storage
 import dagger.hilt.android.AndroidEntryPoint
+import java.io.File
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -21,6 +27,10 @@ class CreateProfileActivity : AppCompatActivity() {
 
     private val REQUEST_CODE = 500
 
+    lateinit var storage: FirebaseStorage
+
+    lateinit var storageRef: StorageReference
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_create_profile)
@@ -32,6 +42,8 @@ class CreateProfileActivity : AppCompatActivity() {
         val btCreateAcc = findViewById<Button>(R.id.createButton)
         val btnUploadImg = findViewById<Button>(R.id.uploadImg)
 
+        storage = Firebase.storage("gs://vibester-sdp.appspot.com")
+        storageRef = storage.reference
 
         btCreateAcc.setOnClickListener {
             usersRepo.createUser(
@@ -61,10 +73,19 @@ class CreateProfileActivity : AppCompatActivity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        var image : ImageView = ImageView(this)
+//        var image : ImageView = ImageView(this)
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE){
-            image.setImageURI(data?.data)
-            var bitmap = (image.drawable as BitmapDrawable).bitmap
+            val uri: Uri = data?.data!!
+            val riversRef = storageRef.child("testImg.jpg")
+
+            var uploadTask = riversRef.putFile(uri)
+
+            uploadTask.addOnFailureListener {
+                // Handle unsuccessful uploads
+            }.addOnSuccessListener { taskSnapshot ->
+                // taskSnapshot.metadata contains file metadata such as size, content-type, etc.
+                // ...
+            }
 
         }
     }

From 7d03ee63e07528980c041875dc8780b2b603109c Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Sun, 17 Apr 2022 15:09:49 +0200
Subject: [PATCH 3/6] Refactored uploading images

---
 .../activity/CreateProfileActivityTest.kt     |  2 +-
 .../activity/CreateProfileActivity.kt         | 41 ++++++++++---------
 .../sdp/vibester/activity/ProfileActivity.kt  |  1 -
 .../ch/sdp/vibester/database/ImageRepo.kt     | 30 ++++++++++++++
 .../java/ch/sdp/vibester/database/Storage.kt  | 15 +++++++
 .../res/layout/activity_create_profile.xml    | 13 ++++++
 6 files changed, 81 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/database/ImageRepo.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/database/Storage.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..d82b7a26a 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -11,6 +11,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.database.ImageRepo
 import ch.sdp.vibester.database.UsersRepo
 import ch.sdp.vibester.profile.UserProfile
 import dagger.hilt.android.testing.BindValue
@@ -81,5 +82,4 @@ class CreateProfileActivityTest {
         Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
     }
 
-
 }
\ 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 e9b6fd915..4e2644ee8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -9,7 +9,9 @@ import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
 import android.widget.ImageView
+import android.widget.TextView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.database.ImageRepo
 import ch.sdp.vibester.database.UsersRepo
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.FirebaseStorage
@@ -25,11 +27,10 @@ class CreateProfileActivity : AppCompatActivity() {
     @Inject
     lateinit var usersRepo: UsersRepo
 
-    private val REQUEST_CODE = 500
-
-    lateinit var storage: FirebaseStorage
+    @Inject
+    lateinit var imageRepo: ImageRepo
 
-    lateinit var storageRef: StorageReference
+    private val REQUEST_CODE = 500
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -42,9 +43,6 @@ class CreateProfileActivity : AppCompatActivity() {
         val btCreateAcc = findViewById<Button>(R.id.createButton)
         val btnUploadImg = findViewById<Button>(R.id.uploadImg)
 
-        storage = Firebase.storage("gs://vibester-sdp.appspot.com")
-        storageRef = storage.reference
-
         btCreateAcc.setOnClickListener {
             usersRepo.createUser(
                 email,
@@ -71,22 +69,27 @@ class CreateProfileActivity : AppCompatActivity() {
         startActivityForResult(intent, REQUEST_CODE)
     }
 
+
+    private fun updateUI() {
+        findViewById<TextView>(R.id.uploadStatus).text = "Upload OK"
+    }
+
+    private 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
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-//        var image : ImageView = ImageView(this)
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE){
             val uri: Uri = data?.data!!
-            val riversRef = storageRef.child("testImg.jpg")
-
-            var uploadTask = riversRef.putFile(uri)
-
-            uploadTask.addOnFailureListener {
-                // Handle unsuccessful uploads
-            }.addOnSuccessListener { taskSnapshot ->
-                // taskSnapshot.metadata contains file metadata such as size, content-type, etc.
-                // ...
-            }
-
+            val imgId = createNewId()
+            imageRepo.uploadFile("profileImg/${imgId}", uri) { 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 0a2bfd309..a370e2998 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -100,7 +100,6 @@ class ProfileActivity : AppCompatActivity() {
 
     private fun queryDatabase(email: String) {
         usersRepo.getUserData(email, this::setupProfile)
-
     }
 
 
diff --git a/app/src/main/java/ch/sdp/vibester/database/ImageRepo.kt b/app/src/main/java/ch/sdp/vibester/database/ImageRepo.kt
new file mode 100644
index 000000000..ee98bca65
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/database/ImageRepo.kt
@@ -0,0 +1,30 @@
+package ch.sdp.vibester.database
+
+import android.content.ContentValues
+import android.net.Uri
+import android.util.Log
+import ch.sdp.vibester.profile.UserProfile
+import com.google.firebase.database.DataSnapshot
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.ValueEventListener
+import com.google.firebase.database.ktx.getValue
+import javax.inject.Inject
+
+/**
+ * The users class which handled all the interactions with the database that are linked to users
+ */
+
+class ImageRepo @Inject constructor() {
+    private val storageRef = Storage.get().reference
+
+    fun uploadFile(filePath: String, fileUri: Uri, callback: () -> Unit): Unit {
+        val profilePicRef = storageRef.child(filePath)
+
+        var uploadTask = profilePicRef.putFile(fileUri)
+
+        // taskSnapshot.metadata contains file metadata such as size, content-type, etc.
+        uploadTask.addOnSuccessListener { taskSnapshot ->
+            callback()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/Storage.kt b/app/src/main/java/ch/sdp/vibester/database/Storage.kt
new file mode 100644
index 000000000..3939909f9
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/database/Storage.kt
@@ -0,0 +1,15 @@
+package ch.sdp.vibester.database
+
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.ktx.storage
+
+/**
+ * The Database objects that returns our storage instance
+ */
+
+object Storage {
+    fun get(): FirebaseStorage {
+        return Firebase.storage("gs://vibester-sdp.appspot.com")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_profile.xml b/app/src/main/res/layout/activity_create_profile.xml
index ba3641383..aad5a6c20 100644
--- a/app/src/main/res/layout/activity_create_profile.xml
+++ b/app/src/main/res/layout/activity_create_profile.xml
@@ -51,6 +51,19 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/uploadStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="129dp"
+        android:layout_marginBottom="79dp"
+        android:text="Upload Status"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toTopOf="@+id/accountUsername"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <Button
         android:id="@+id/createButton"
         android:layout_width="wrap_content"

From 3eb8f60d80711fa48ef0be9420e796f8aeef7204 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Sun, 17 Apr 2022 15:22:27 +0200
Subject: [PATCH 4/6] Added a util class for useful functions

---
 .../vibester/activity/CreateProfileActivity.kt | 12 ++----------
 .../java/ch/sdp/vibester/database/UsersRepo.kt |  7 ++-----
 app/src/main/java/ch/sdp/vibester/util/Util.kt | 16 ++++++++++++++++
 app/src/test/java/ch/sdp/vibester/UtilTests.kt | 18 ++++++++++++++++++
 4 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/ch/sdp/vibester/util/Util.kt
 create mode 100644 app/src/test/java/ch/sdp/vibester/UtilTests.kt

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 4e2644ee8..aeae47bca 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -13,6 +13,7 @@ import android.widget.TextView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.database.ImageRepo
 import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.util.Util
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.FirebaseStorage
 import com.google.firebase.storage.StorageReference
@@ -74,21 +75,12 @@ class CreateProfileActivity : AppCompatActivity() {
         findViewById<TextView>(R.id.uploadStatus).text = "Upload OK"
     }
 
-    private 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
-    }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE){
             val uri: Uri = data?.data!!
-            val imgId = createNewId()
+            val imgId = Util.createNewId()
             imageRepo.uploadFile("profileImg/${imgId}", uri) { updateUI() }
         }
     }
diff --git a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt b/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
index e8a52a902..d3f827d68 100644
--- a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.database
 import android.content.ContentValues
 import android.util.Log
 import ch.sdp.vibester.profile.UserProfile
+import ch.sdp.vibester.util.Util
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.ValueEventListener
@@ -53,11 +54,7 @@ class UsersRepo @Inject constructor() {
         var newUser = UserProfile(handle, username, "", email, 0, 0, 0, 0
         )
 
-        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("");
+        val newId = Util.createNewId()
 
         dbRef.child(newId).setValue(newUser)
             .addOnSuccessListener {
diff --git a/app/src/main/java/ch/sdp/vibester/util/Util.kt b/app/src/main/java/ch/sdp/vibester/util/Util.kt
new file mode 100644
index 000000000..8bc91e5af
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/util/Util.kt
@@ -0,0 +1,16 @@
+package ch.sdp.vibester.util
+
+class Util {
+    companion object {
+        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
diff --git a/app/src/test/java/ch/sdp/vibester/UtilTests.kt b/app/src/test/java/ch/sdp/vibester/UtilTests.kt
new file mode 100644
index 000000000..b7b1def98
--- /dev/null
+++ b/app/src/test/java/ch/sdp/vibester/UtilTests.kt
@@ -0,0 +1,18 @@
+package ch.sdp.vibester
+
+import ch.sdp.vibester.util.Util
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class UtilTests {
+    @Test
+    fun newIdIsCorrectLength() {
+        assertEquals(Util.createNewId().length, 10)
+    }
+}
\ No newline at end of file

From 71197081ecc875d07625515851722722217333eb Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Sun, 17 Apr 2022 15:52:53 +0200
Subject: [PATCH 5/6] Added a util tests to correct folder

---
 .../java/ch/sdp/vibester/UtilTest.kt}                         | 2 +-
 .../java/ch/sdp/vibester/activity/CreateProfileActivity.kt    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename app/src/{test/java/ch/sdp/vibester/UtilTests.kt => androidTest/java/ch/sdp/vibester/UtilTest.kt} (95%)

diff --git a/app/src/test/java/ch/sdp/vibester/UtilTests.kt b/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
similarity index 95%
rename from app/src/test/java/ch/sdp/vibester/UtilTests.kt
rename to app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
index b7b1def98..f081c9a67 100644
--- a/app/src/test/java/ch/sdp/vibester/UtilTests.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
@@ -10,7 +10,7 @@ import org.junit.Assert.*
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
-class UtilTests {
+class UtilTest {
     @Test
     fun newIdIsCorrectLength() {
         assertEquals(Util.createNewId().length, 10)
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 aeae47bca..e697c37a8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -79,9 +79,7 @@ class CreateProfileActivity : AppCompatActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE){
-            val uri: Uri = data?.data!!
-            val imgId = Util.createNewId()
-            imageRepo.uploadFile("profileImg/${imgId}", uri) { updateUI() }
+            imageRepo.uploadFile("profileImg/${Util.createNewId()}", data?.data!!) { updateUI() }
         }
     }
 }
\ No newline at end of file

From 8172990e1b62d55d17dc0a1d5a14ad3482629336 Mon Sep 17 00:00:00 2001
From: "Your laurynas.lopata@epfl.ch" <laurynas.lopata@epfl.ch>
Date: Tue, 19 Apr 2022 19:20:49 +0300
Subject: [PATCH 6/6] Implemented changes

---
 .../java/ch/sdp/vibester/activity/CreateProfileActivity.kt     | 2 +-
 app/src/main/java/ch/sdp/vibester/util/Util.kt                 | 3 +++
 app/src/main/res/values/strings.xml                            | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

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 e697c37a8..cef9f80e6 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -72,7 +72,7 @@ class CreateProfileActivity : AppCompatActivity() {
 
 
     private fun updateUI() {
-        findViewById<TextView>(R.id.uploadStatus).text = "Upload OK"
+        findViewById<TextView>(R.id.uploadStatus).text = getString(R.string.uploadImageStatus)
     }
 
 
diff --git a/app/src/main/java/ch/sdp/vibester/util/Util.kt b/app/src/main/java/ch/sdp/vibester/util/Util.kt
index 8bc91e5af..e2057df6e 100644
--- a/app/src/main/java/ch/sdp/vibester/util/Util.kt
+++ b/app/src/main/java/ch/sdp/vibester/util/Util.kt
@@ -2,6 +2,9 @@ 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)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64820ab3e..da5de8abb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,6 +51,7 @@
     <string name="notAnEmail">Not an email</string>
     <string name="shortPassword">Password has to be at least 6 symbols</string>
     <string name="AccCreation">Account creation form</string>
+    <string name="uploadImageStatus">Upload OK</string>
 
     <string name="game_end__player_name">Player Name Here</string>
     <string name="game_end__show_stats">Here are your stats!</string>