Bugfix/122 fix resource leakage

app/src/main/java/audio/funkwhale/ffa/activities/DownloadsActivity.kt

@@ -14,7 +14,6 @@ import com.google.android.exoplayer2.offline.DownloadManager
 import kotlinx.coroutines.Dispatchers.Default
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.java.KoinJavaComponent.inject
@@ -65,10 +64,9 @@ class DownloadsActivity : AppCompatActivity() {
 
   private fun refresh() {
     lifecycleScope.launch(Main) {
-      val cursor = exoDownloadManager.downloadIndex.getDownloads()
-
       adapter.downloads.clear()
-
+      exoDownloadManager.downloadIndex.getDownloads()
+        .use { cursor ->
           while (cursor.moveToNext()) {
             val download = cursor.download
 
@@ -78,7 +76,7 @@ class DownloadsActivity : AppCompatActivity() {
               )
             }
           }
-
+        }
       adapter.notifyDataSetChanged()
     }
   }
@@ -101,15 +99,17 @@ class DownloadsActivity : AppCompatActivity() {
   }
 
   private suspend fun refreshProgress() {
-    val cursor = exoDownloadManager.downloadIndex.getDownloads()
+    exoDownloadManager.downloadIndex.getDownloads()
-
+      .use { cursor ->
         while (cursor.moveToNext()) {
           val download = cursor.download
 
           download.getMetadata()?.let { info ->
             adapter.downloads.withIndex().associate { it.value to it.index }
               .filter { it.key.id == info.id }.toList().getOrNull(0)?.let { match ->
-            if (download.state == Download.STATE_DOWNLOADING && download.percentDownloaded != info.download?.percentDownloaded ?: 0) {
+                if (download.state == Download.STATE_DOWNLOADING
+                  && download.percentDownloaded != (info.download?.percentDownloaded ?: 0)
+                ) {
                   withContext(Main) {
                     adapter.downloads[match.second] = info.apply {
                       this.download = download
@@ -122,6 +122,7 @@ class DownloadsActivity : AppCompatActivity() {
           }
         }
       }
+  }
 
   inner class DownloadChangedListener : DownloadsAdapter.OnDownloadChangedListener {
     override fun onItemRemoved(index: Int) {

app/src/main/java/audio/funkwhale/ffa/repositories/TracksRepository.kt

@@ -42,19 +42,18 @@ class TracksRepository(override val context: Context?, albumId: Int) :
 
   companion object {
     fun getDownloadedIds(exoDownloadManager: DownloadManager): List<Int>? {
-      val cursor = exoDownloadManager.downloadIndex.getDownloads()
       val ids: MutableList<Int> = mutableListOf()
-
+      exoDownloadManager.downloadIndex.getDownloads()
+        .use { cursor ->
           while (cursor.moveToNext()) {
             val download = cursor.download
-
             download.getMetadata()?.let {
               if (download.state == Download.STATE_COMPLETED) {
                 ids.add(it.id)
               }
             }
           }
-
+        }
       return ids
     }
   }

changes/changelog.d/122.bugfix

@@ -0,0 +1 @@
+Fix leaked database cursor resource