From f709ac92aec79d36e3e1ef3d1c98e7f1c1543fbd Mon Sep 17 00:00:00 2001
From: Shubert Munthali <shubertm.m@gmail.com>
Date: Tue, 9 Sep 2025 14:43:28 +0200
Subject: [PATCH 1/2] Handle exception when loading

---
 .../com/infbyte/amuzeo/repo/VideosRepo.kt     | 145 +++++++++---------
 app/src/main/res/values/strings.xml           |   2 +-
 2 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt b/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt
index 768b4d0..9e39ed7 100644
--- a/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt
+++ b/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt
@@ -3,6 +3,7 @@ package com.infbyte.amuzeo.repo
 import android.content.ContentUris
 import android.content.Context
 import android.provider.MediaStore
+import android.util.Log
 import android.util.Size
 import androidx.annotation.OptIn
 import androidx.media3.common.MediaItem
@@ -44,81 +45,85 @@ class VideosRepo(private val context: Context) {
         onComplete: (videos: List<Video>, folders: List<Folder>) -> Unit,
     ) {
         withContext(Dispatchers.IO) {
-            isLoading()
-            val contentResolver = context.contentResolver
-            val query =
-                contentResolver.query(
-                    uri,
-                    projection,
-                    selection,
-                    selectionArgs,
-                    sortOrder,
-                )
-            _videos.clear()
-            query?.let {
-                val idColumn =
-                    it.getColumnIndexOrThrow(MediaStore.Video.Media._ID)
-                val titleColumn =
-                    it.getColumnIndexOrThrow(MediaStore.Video.Media.TITLE)
-                val artistColumn =
-                    it.getColumnIndexOrThrow(MediaStore.Video.Media.ARTIST)
-                val albumColumn =
-                    it.getColumnIndexOrThrow(MediaStore.Video.Media.ALBUM)
-                val pathColumn =
-                    it.getColumnIndexOrThrow(MediaStore.Video.Media.DATA)
-
-                while (it.moveToNext()) {
-                    val id = it.getLong(idColumn)
-                    val title = it.getString(titleColumn)
-                    val artist = it.getString(artistColumn)
-                    val album = it.getString(albumColumn)
-                    val videoUri =
-                        ContentUris.withAppendedId(
-                            MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
-                            id,
-                        )
-
-                    val path = it.getString(pathColumn)
-
-                    val meta =
-                        MediaMetadata.Builder()
-                            .setAlbumTitle(album)
-                            .setArtist(artist)
-                            .setTitle(title)
-                            .setDurationMs(context.getVideoDuration(videoUri))
-                            .build()
-
-                    val item =
-                        MediaItem.Builder()
-                            .setMediaMetadata(meta)
-                            .setUri(videoUri)
-                            .setMediaId(id.toString())
-                            .build()
-
-                    val videoPath = Paths.get(path)
-
-                    val fileId = videoPath.fileId()
-
-                    val thumbnail = context.createVideoThumbnail(videoUri, Size(640, 480))
-
-                    if (thumbnail != null) {
-                        contentIds.add(fileId)
-
-                        _videos +=
-                            Video(
-                                item = item,
-                                folder = extractFolderName(path),
-                                fileId = fileId,
-                                thumbnail = thumbnail,
+            try {
+                isLoading()
+                val contentResolver = context.contentResolver
+                val query =
+                    contentResolver.query(
+                        uri,
+                        projection,
+                        selection,
+                        selectionArgs,
+                        sortOrder,
+                    )
+                _videos.clear()
+                query?.let {
+                    val idColumn =
+                        it.getColumnIndexOrThrow(MediaStore.Video.Media._ID)
+                    val titleColumn =
+                        it.getColumnIndexOrThrow(MediaStore.Video.Media.TITLE)
+                    val artistColumn =
+                        it.getColumnIndexOrThrow(MediaStore.Video.Media.ARTIST)
+                    val albumColumn =
+                        it.getColumnIndexOrThrow(MediaStore.Video.Media.ALBUM)
+                    val pathColumn =
+                        it.getColumnIndexOrThrow(MediaStore.Video.Media.DATA)
+
+                    while (it.moveToNext()) {
+                        val id = it.getLong(idColumn)
+                        val title = it.getString(titleColumn)
+                        val artist = it.getString(artistColumn)
+                        val album = it.getString(albumColumn)
+                        val videoUri =
+                            ContentUris.withAppendedId(
+                                MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
+                                id,
                             )
 
-                        _folderPaths.add(extractFolderPath(path))
+                        val path = it.getString(pathColumn)
+
+                        val meta =
+                            MediaMetadata.Builder()
+                                .setAlbumTitle(album)
+                                .setArtist(artist)
+                                .setTitle(title)
+                                .setDurationMs(context.getVideoDuration(videoUri))
+                                .build()
+
+                        val item =
+                            MediaItem.Builder()
+                                .setMediaMetadata(meta)
+                                .setUri(videoUri)
+                                .setMediaId(id.toString())
+                                .build()
+
+                        val videoPath = Paths.get(path)
+
+                        val fileId = videoPath.fileId()
+
+                        val thumbnail = context.createVideoThumbnail(videoUri, Size(640, 480))
+
+                        if (thumbnail != null) {
+                            contentIds.add(fileId)
+
+                            _videos +=
+                                Video(
+                                    item = item,
+                                    folder = extractFolderName(path),
+                                    fileId = fileId,
+                                    thumbnail = thumbnail,
+                                )
+
+                            _folderPaths.add(extractFolderPath(path))
+                        }
                     }
+                    query.close()
                 }
-                query.close()
+                loadFolders()
+                onComplete(videos, folders)
+            } catch(e: Exception) {
+                Log.d(LOG_TAG, "loading videos failed with exception: $e")
             }
-            loadFolders()
-            onComplete(videos, folders)
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0833044..6a069b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,6 +16,6 @@
     <string name="amuzeo_tag">Tag</string>
     <string name="amuzeo_apply">Apply</string>
     <string name="amuzeo_cancel">Cancel</string>
-    <string name="amuzeo_preparing">Preparing your videos...</string>
+    <string name="amuzeo_preparing">Preparing your videos</string>
     <string name="amuzeo_perm_rationale">To play video, Amuzeo requires Video permisson.</string>
 </resources>

From ff9e7b87d30048ba2062a3757f032e494fd3ea6b Mon Sep 17 00:00:00 2001
From: Shubert Munthali <shubertm.m@gmail.com>
Date: Tue, 9 Sep 2025 14:48:04 +0200
Subject: [PATCH 2/2] Fix lint

---
 app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt b/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt
index 9e39ed7..93ee4d4 100644
--- a/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt
+++ b/app/src/main/java/com/infbyte/amuzeo/repo/VideosRepo.kt
@@ -121,7 +121,7 @@ class VideosRepo(private val context: Context) {
                 }
                 loadFolders()
                 onComplete(videos, folders)
-            } catch(e: Exception) {
+            } catch (e: Exception) {
                 Log.d(LOG_TAG, "loading videos failed with exception: $e")
             }
         }