From 826092f1540fdd0cf405125dd2d8203abc329006 Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 12 May 2022 14:34:52 +0200
Subject: [PATCH 1/7] Edited downloadActivity to store the API call result

---
 .../sdp/vibester/activity/DownloadActivity.kt  | 18 ++++++++++++++++++
 app/src/main/res/layout/activity_download.xml  | 17 +++++++++++++----
 app/src/main/res/values/strings.xml            |  1 +
 3 files changed, 32 insertions(+), 4 deletions(-)

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 a6d005053..dd9c1c96a 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -204,8 +204,26 @@ class DownloadActivity : AppCompatActivity() {
             records.createNewFile()
         }
         records.appendText("$songName\n")
+        recordProperties()
     }
 
+    /**
+     * Records the properties of a song.
+     * Order of storage: Track name - artist name - artwork URL - preview URL.
+     */
+    private fun recordProperties() {
+        var properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+
+        if(!properties.exists()) {
+            properties.createNewFile()
+        }
+
+        val trackName = song.getTrackName()
+        val artistName = song.getArtistName()
+        val artworkURL = song.getArtworkUrl()
+        val previewURL = song.getPreviewUrl()
+        properties.appendText("$trackName - $artistName - $artworkURL - $previewURL\n")
+    }
 
     fun switchToDeleteSongs(view: View) {
         val intent = Intent(this, DeleteSongsActivity::class.java)
diff --git a/app/src/main/res/layout/activity_download.xml b/app/src/main/res/layout/activity_download.xml
index 3ec313442..8bbd6f604 100644
--- a/app/src/main/res/layout/activity_download.xml
+++ b/app/src/main/res/layout/activity_download.xml
@@ -23,15 +23,13 @@
         android:id="@+id/download_songName"
         android:layout_width="253dp"
         android:layout_height="50dp"
-        android:layout_marginTop="100dp"
-        android:layout_marginBottom="50dp"
+        android:layout_marginTop="39dp"
         android:ems="10"
         android:hint="@string/download_songname"
         android:inputType="textPersonName"
-        app:layout_constraintBottom_toTopOf="@+id/download_downloadsong"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/download_indicator"
         tools:ignore="TextContrastCheck" />
 
     <Button
@@ -57,4 +55,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/download_downloadsong" />
 
+    <TextView
+        android:id="@+id/download_indicator"
+        android:layout_width="313dp"
+        android:layout_height="59dp"
+        android:layout_marginTop="28dp"
+        android:text="@string/download_indicator"
+        android:textAlignment="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 5ef328897..f2dcfe9a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,6 +109,7 @@
     <string name="download_permission_denied">Permission denied, cannot download!</string>
     <string name="download_already_downloading">A song is being downloaded, please be patient!</string>
     <string name="download_please_retry_later">Please retry later!</string>
+    <string name="download_indicator">Please write the name of the song you desire to download in the following format:\n Song Name - Artist Name</string>
 
     <string name="Singleplayer">Single-player</string>
     <string name="Multiplayer">Multiplayer</string>

From 5c09b57f8353eb620cbe40cd5fa149fce4aff6f5 Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 12 May 2022 14:38:07 +0200
Subject: [PATCH 2/7] Commented the parts related to the offline mode for now
 under 'TODO: OFFLINE'

---
 .../main/java/ch/sdp/vibester/activity/DownloadActivity.kt    | 4 ++++
 1 file changed, 4 insertions(+)

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 dd9c1c96a..5155b5946 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -204,13 +204,16 @@ class DownloadActivity : AppCompatActivity() {
             records.createNewFile()
         }
         records.appendText("$songName\n")
+        /* TODO: OFFLINE
         recordProperties()
+         */
     }
 
     /**
      * Records the properties of a song.
      * Order of storage: Track name - artist name - artwork URL - preview URL.
      */
+    /* TODO: OFFLINE
     private fun recordProperties() {
         var properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
 
@@ -224,6 +227,7 @@ class DownloadActivity : AppCompatActivity() {
         val previewURL = song.getPreviewUrl()
         properties.appendText("$trackName - $artistName - $artworkURL - $previewURL\n")
     }
+     */
 
     fun switchToDeleteSongs(view: View) {
         val intent = Intent(this, DeleteSongsActivity::class.java)

From 89e1ad25a919b338ae0abadef939a9bade46523d Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 12 May 2022 16:19:51 +0200
Subject: [PATCH 3/7] Added necessary code to use downloaded media. Some code
 are commented.

---
 .../sdp/vibester/model/OfflineSongListTest.kt |  29 ++++
 .../java/ch/sdp/vibester/api/AudioPlayer.kt   |   2 +-
 .../vibester/fragment/GameSetupFragment.kt    |   7 +
 .../sdp/vibester/helper/BuzzerGameManager.kt  |  11 +-
 .../ch/sdp/vibester/model/OfflineSongList.kt  | 129 ++++++++++++++++++
 .../java/ch/sdp/vibester/model/SongList.kt    |   1 -
 6 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
 create mode 100644 app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt

diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
new file mode 100644
index 000000000..8f77b9edd
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
@@ -0,0 +1,29 @@
+package ch.sdp.vibester.model
+
+import androidx.test.platform.app.InstrumentationRegistry
+import ch.sdp.vibester.api.LastfmMethod
+import org.junit.Assert
+import org.junit.Test
+
+class OfflineSongListTest {
+
+    @Test
+    fun noSongsAvailableInitialization() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        val mySongsList = OfflineSongList(context, LastfmMethod.BY_TAG.method)
+
+        val inputSongsList = mutableListOf<Pair<String, String>>()
+        val page = "1"
+        val songsPerPage = "100"
+        val totalPages = "20"
+        val totalSongs = "2000"
+
+
+        Assert.assertEquals(inputSongsList, mySongsList.getSongList())
+        Assert.assertEquals(page, mySongsList.getPage())
+        Assert.assertEquals(songsPerPage, mySongsList.getSongsPerPage())
+        Assert.assertEquals(totalPages, mySongsList.getTotalPages())
+        Assert.assertEquals(totalSongs, mySongsList.getTotalSongs())
+        Assert.assertTrue(mySongsList.getEmptySongs())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/api/AudioPlayer.kt b/app/src/main/java/ch/sdp/vibester/api/AudioPlayer.kt
index 528783867..64b2003df 100644
--- a/app/src/main/java/ch/sdp/vibester/api/AudioPlayer.kt
+++ b/app/src/main/java/ch/sdp/vibester/api/AudioPlayer.kt
@@ -10,7 +10,7 @@ class AudioPlayer private constructor() {
     companion object {
         /**
          * A function that given an audio stream url will play it
-         * @param audioUrl Url in String pointing towards the audio stream
+         * @param audioUrl Url in String pointing towards the audio stream OR the path to the file to be listened to
          * @return CompletableFuture<MediaPlayer> that contains the current playing mediaPlayer
          */
         fun playAudio(audioUrl: String): CompletableFuture<MediaPlayer> {
diff --git a/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
index f16b91a6c..6ad0a5a3f 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
@@ -37,6 +37,9 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
     var game = "local_buzzer"
     var gameSize = R.string.one.toString()
     lateinit var gameManager: GameManager
+    /* TODO: OFFLINE
+    private var hasInternet: Boolean = true
+     */
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -159,6 +162,10 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
         call.enqueue(object : Callback<Any> {
             override fun onFailure(call: Call<Any>, t: Throwable?) {}
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
+                /* TODO: OFFLINE
+                gameManager.setInternet()
+                gameManager.setContext(context)
+                 */
                 gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
             }
         })
diff --git a/app/src/main/java/ch/sdp/vibester/helper/BuzzerGameManager.kt b/app/src/main/java/ch/sdp/vibester/helper/BuzzerGameManager.kt
index 75856d021..547dd82b6 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/BuzzerGameManager.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/BuzzerGameManager.kt
@@ -10,6 +10,7 @@ class BuzzerGameManager: GameManager() {
     lateinit var score: BuzzerScoreUpdater
     private lateinit var mediaPlayer: CompletableFuture<MediaPlayer>
     lateinit var scoreUpdater: BuzzerScoreUpdater
+    private var hasInternet: Boolean = true
 
     /**
      * Check if mediaPlayer is initialized
@@ -22,7 +23,15 @@ class BuzzerGameManager: GameManager() {
      * Play current song with media player.
      */
     fun playSong() {
-        mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
+        if(hasInternet) {
+            mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
+        } else {
+            mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
+            /* TODO: OFFLINE
+            var media = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$currentSong.getTrackName()")
+            mediaPlayer = AudioPlayer.playAudio(media.absolutePath)
+             */
+        }
     }
 
     /**
diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
new file mode 100644
index 000000000..2785eca3a
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -0,0 +1,129 @@
+package ch.sdp.vibester.model
+
+import android.content.Context
+import android.os.Environment
+import ch.sdp.vibester.api.LastfmMethod
+import java.io.BufferedReader
+import java.io.File
+import java.io.FileReader
+
+/**
+ * Process the fetched data from the external storage of the app.
+ * Mainly, it creates a list of songs in the form Pair("$songName", "$artistName")
+ * @param ctx: Context of the caller, to fetch the downloaded folder
+ * @param method: Chosen playlist type
+ */
+class OfflineSongList(ctx: Context, method: String) {
+    private var songList = mutableListOf<Pair<String, String>>()
+    private var page = ""
+    private var songsPerPage = ""
+    private var totalPages = ""
+    private var totalSongs = ""
+    private var context = ctx
+    private var emptySongs: Boolean = false
+
+    init {
+        try {
+            var tracksField = "tracks"
+            if (method == LastfmMethod.BY_ARTIST.method) {
+                tracksField = "toptracks"
+            }
+
+            fillList()
+
+            page = "1"
+            songsPerPage = "100"
+            totalPages = "20"
+            totalSongs = "2000"
+
+        } catch (e: Exception) {
+            throw IllegalArgumentException("OfflineSongList constructor, failed reading from file or empty file!")
+        }
+    }
+
+    /**
+     * Adds from the downloads to the list of songs ("$songName", "$artistName")
+     * Saves the list of songs in songList
+     */
+    private fun fillList() {
+        var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+
+
+        if(!records.exists() || records.length() == 0L) {
+            //There are no downloaded songs, keep the song list empty
+            emptySongs = true
+        } else {
+            var reader = BufferedReader(FileReader(records))
+            var currentLine = reader.readLine()
+
+            while(currentLine != null) {
+                var trimmed = currentLine.trim()
+                if(trimmed.isNotEmpty()) {
+                    val split = trimmed.split("-")
+                    if(split.size == 2) {
+                        songList.add(Pair(split[0], split[1]))
+                    }
+                }
+                currentLine = reader.readLine()
+            }
+            reader.close()
+            emptySongs = false
+        }
+    }
+
+    /**
+     * Getter that return songs for the given tag
+     * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
+     */
+    fun getSongList(): MutableList<Pair<String, String>> {
+        return songList
+    }
+
+    /**
+     * Getter that return shuffled song list
+     * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
+     */
+    fun getShuffledSongList(): MutableList<Pair<String, String>> {
+        return songList.asSequence().shuffled().toMutableList()
+    }
+
+    /**
+     * Getter that return page number from the query
+     * @return String page
+     */
+    fun getPage(): String {
+        return page
+    }
+
+    /**
+     * Getter that return total number of songs in the tag
+     * @return String totalSongs
+     */
+    fun getTotalSongs(): String {
+        return totalSongs
+    }
+
+    /**
+     * Getter that return the total number of pages with songs by tag
+     * @return String totalPages
+     */
+    fun getTotalPages(): String {
+        return totalPages
+    }
+
+    /**
+     * Getter that return the total number of songs in the page
+     * @return String perPage
+     */
+    fun getSongsPerPage(): String {
+        return songsPerPage
+    }
+
+    /**
+     * Getter that returns whether there are downloaded songs available or not
+     * @return Boolean emptySongs
+     */
+    fun getEmptySongs(): Boolean {
+        return emptySongs
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/SongList.kt b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
index 6c334e457..93c9a8b9d 100644
--- a/app/src/main/java/ch/sdp/vibester/model/SongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/SongList.kt
@@ -10,7 +10,6 @@ import org.json.JSONObject
  * @param jsonMeta: Lastfm fetched data
  */
 class SongList(jsonMeta: String, method: String) {
-    private var GAME_SIZE = 100
     private var songList = mutableListOf<Pair<String, String>>()
     private var page = ""
     private var songsPerPage = ""

From 2c8a3410fef68e786f2200f006768cdda68cf48f Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 12 May 2022 17:00:17 +0200
Subject: [PATCH 4/7] Improved readability and resolved merge
 conflicts(hopefully)

---
 .../sdp/vibester/model/OfflineSongListTest.kt |  2 +-
 .../sdp/vibester/activity/DownloadActivity.kt | 14 ++++-----
 .../ch/sdp/vibester/helper/GameManager.kt     | 11 ++++++-
 .../ch/sdp/vibester/model/OfflineSongList.kt  | 29 +++++++------------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
index 8f77b9edd..62b9c13c8 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
@@ -10,7 +10,7 @@ class OfflineSongListTest {
     @Test
     fun noSongsAvailableInitialization() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
-        val mySongsList = OfflineSongList(context, LastfmMethod.BY_TAG.method)
+        val mySongsList = OfflineSongList(context)
 
         val inputSongsList = mutableListOf<Pair<String, String>>()
         val page = "1"
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 5155b5946..09c3d63bf 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -77,7 +77,7 @@ class DownloadActivity : AppCompatActivity() {
      * Function that handles deletion button pushes.
      */
     private fun downloadListener(songView: TextView) {
-        if(downloadStarted) {
+        if (downloadStarted) {
             Toast.makeText(applicationContext, getString(R.string.download_already_downloading), Toast.LENGTH_LONG).show()
             editTextView(getString(R.string.download_please_retry_later), songView)
         } else {
@@ -138,8 +138,8 @@ class DownloadActivity : AppCompatActivity() {
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if(requestCode == STORAGE_PERMISSION_CODE) {
-            if(grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+        if (requestCode == STORAGE_PERMISSION_CODE) {
+            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 downloadId = startDownload()
             }
         } else {
@@ -151,9 +151,9 @@ class DownloadActivity : AppCompatActivity() {
      * Checks if the required app permissions are already given. If not, request those permissions.
      */
     private fun checkPermissionsAndDownload() {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
             Build.VERSION.SDK_INT <  Build.VERSION_CODES.Q) {
-            if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
                 requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION_CODE)
             } else {
                 downloadId = startDownload()
@@ -200,7 +200,7 @@ class DownloadActivity : AppCompatActivity() {
     private fun record() {
         var records = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
 
-        if(!records.exists()) {
+        if (!records.exists()) {
             records.createNewFile()
         }
         records.appendText("$songName\n")
@@ -217,7 +217,7 @@ class DownloadActivity : AppCompatActivity() {
     private fun recordProperties() {
         var properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
 
-        if(!properties.exists()) {
+        if (!properties.exists()) {
             properties.createNewFile()
         }
 
diff --git a/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt b/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt
index 3bb79e31d..b908d506d 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt
@@ -24,6 +24,7 @@ open class GameManager : Serializable {
     private var artistName = ""
     private var songName = ""
     var nextSongInd = 0
+    private var hasInternet: Boolean = true
 
     private lateinit var mediaPlayer: CompletableFuture<MediaPlayer>
 
@@ -161,7 +162,15 @@ open class GameManager : Serializable {
      * Play current song with media player.
      */
     fun playSong() {
-        mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
+        if(hasInternet) {
+            mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
+        } else {
+            mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
+            /* TODO: OFFLINE
+            var media = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$currentSong.getTrackName()")
+            mediaPlayer = AudioPlayer.playAudio(media.absolutePath)
+             */
+        }
     }
 
     /**
diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index 2785eca3a..a7ea10a12 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -13,29 +13,20 @@ import java.io.FileReader
  * @param ctx: Context of the caller, to fetch the downloaded folder
  * @param method: Chosen playlist type
  */
-class OfflineSongList(ctx: Context, method: String) {
+class OfflineSongList(ctx: Context) {
     private var songList = mutableListOf<Pair<String, String>>()
-    private var page = ""
-    private var songsPerPage = ""
-    private var totalPages = ""
-    private var totalSongs = ""
+    private val page = "1"
+    private val songsPerPage = "100"
+    private val totalPages = "20"
+    private val totalSongs = "2000"
     private var context = ctx
     private var emptySongs: Boolean = false
 
     init {
         try {
-            var tracksField = "tracks"
-            if (method == LastfmMethod.BY_ARTIST.method) {
-                tracksField = "toptracks"
-            }
 
             fillList()
 
-            page = "1"
-            songsPerPage = "100"
-            totalPages = "20"
-            totalSongs = "2000"
-
         } catch (e: Exception) {
             throw IllegalArgumentException("OfflineSongList constructor, failed reading from file or empty file!")
         }
@@ -49,18 +40,18 @@ class OfflineSongList(ctx: Context, method: String) {
         var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
 
 
-        if(!records.exists() || records.length() == 0L) {
+        if (!records.exists() || records.length() == 0L) {
             //There are no downloaded songs, keep the song list empty
             emptySongs = true
         } else {
             var reader = BufferedReader(FileReader(records))
             var currentLine = reader.readLine()
 
-            while(currentLine != null) {
+            while (currentLine != null) {
                 var trimmed = currentLine.trim()
-                if(trimmed.isNotEmpty()) {
+                if (trimmed.isNotEmpty()) {
                     val split = trimmed.split("-")
-                    if(split.size == 2) {
+                    if (split.size == 2) {
                         songList.add(Pair(split[0], split[1]))
                     }
                 }
@@ -83,7 +74,7 @@ class OfflineSongList(ctx: Context, method: String) {
      * Getter that return shuffled song list
      * @return MutableList<Pair<String,String>> of type Pair("$songName", "$artistName")
      */
-    fun getShuffledSongList(): MutableList<Pair<String, String>> {
+    fun getShuffledDownloadedSongList(): MutableList<Pair<String, String>> {
         return songList.asSequence().shuffled().toMutableList()
     }
 

From 2e149d8bd6cabfff22ad58b0a6a39a09a70a926a Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 12 May 2022 18:19:51 +0200
Subject: [PATCH 5/7] Improved test coverage

---
 .../sdp/vibester/model/OfflineSongListTest.kt | 27 +++++++++++++++++++
 .../ch/sdp/vibester/model/OfflineSongList.kt  |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
index 62b9c13c8..112bd0f7d 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
@@ -1,9 +1,11 @@
 package ch.sdp.vibester.model
 
+import android.os.Environment
 import androidx.test.platform.app.InstrumentationRegistry
 import ch.sdp.vibester.api.LastfmMethod
 import org.junit.Assert
 import org.junit.Test
+import java.io.File
 
 class OfflineSongListTest {
 
@@ -26,4 +28,29 @@ class OfflineSongListTest {
         Assert.assertEquals(totalSongs, mySongsList.getTotalSongs())
         Assert.assertTrue(mySongsList.getEmptySongs())
     }
+
+    @Test
+    fun addSpecificSongToList() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        records.createNewFile()
+        records.appendText("bones - imagine dragons\n")
+
+        val mySongsList = OfflineSongList(context)
+
+        val songName = "bones"
+        val artistName = "imagine dragons"
+        val inputSongsList = mutableListOf(Pair(songName, artistName))
+        val page = "1"
+        val songsPerPage = "100"
+        val totalPages = "20"
+        val totalSongs = "2000"
+
+        Assert.assertEquals(inputSongsList, mySongsList.getSongList())
+        Assert.assertEquals(page, mySongsList.getPage())
+        Assert.assertEquals(songsPerPage, mySongsList.getSongsPerPage())
+        Assert.assertEquals(totalPages, mySongsList.getTotalPages())
+        Assert.assertEquals(totalSongs, mySongsList.getTotalSongs())
+        Assert.assertTrue(!mySongsList.getEmptySongs())
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index a7ea10a12..4be0fb325 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -52,7 +52,7 @@ class OfflineSongList(ctx: Context) {
                 if (trimmed.isNotEmpty()) {
                     val split = trimmed.split("-")
                     if (split.size == 2) {
-                        songList.add(Pair(split[0], split[1]))
+                        songList.add(Pair(split[0].trim(), split[1].trim()))
                     }
                 }
                 currentLine = reader.readLine()

From 1c418ce324d29fe7b84af1dad5b980e300890c7c Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 12 May 2022 18:50:34 +0200
Subject: [PATCH 6/7] Debugged the test lmao

---
 .../java/ch/sdp/vibester/model/OfflineSongListTest.kt           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
index 112bd0f7d..75d58bac3 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
@@ -52,5 +52,7 @@ class OfflineSongListTest {
         Assert.assertEquals(totalPages, mySongsList.getTotalPages())
         Assert.assertEquals(totalSongs, mySongsList.getTotalSongs())
         Assert.assertTrue(!mySongsList.getEmptySongs())
+
+        records.delete()
     }
 }
\ No newline at end of file

From 8b297d0d5348e0541aeaa932c6c7bf7228521c4f Mon Sep 17 00:00:00 2001
From: Derin Arda Alpay <d.arda.alpay@gmail.com>
Date: Thu, 12 May 2022 20:09:46 +0200
Subject: [PATCH 7/7] Got rid of useless try catch block and improved
 readability

---
 .../java/ch/sdp/vibester/model/OfflineSongListTest.kt     | 1 -
 .../main/java/ch/sdp/vibester/model/OfflineSongList.kt    | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
index 75d58bac3..37d6a8ae8 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
@@ -20,7 +20,6 @@ class OfflineSongListTest {
         val totalPages = "20"
         val totalSongs = "2000"
 
-
         Assert.assertEquals(inputSongsList, mySongsList.getSongList())
         Assert.assertEquals(page, mySongsList.getPage())
         Assert.assertEquals(songsPerPage, mySongsList.getSongsPerPage())
diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index 4be0fb325..ed5c5a474 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -23,13 +23,7 @@ class OfflineSongList(ctx: Context) {
     private var emptySongs: Boolean = false
 
     init {
-        try {
-
-            fillList()
-
-        } catch (e: Exception) {
-            throw IllegalArgumentException("OfflineSongList constructor, failed reading from file or empty file!")
-        }
+        fillList()
     }
 
     /**