refactor: combine 10 open auto-refactor pull requests

app/src/main/kotlin/com/arflix/tv/cast/CastManager.kt

@@ -32,9 +32,9 @@ class CastManager @Inject constructor(
     @ApplicationContext private val context: Context
 ) {
     sealed class CastState {
-        object NotAvailable : CastState()
-        object NotConnected : CastState()
-        object Connecting : CastState()
+        data object NotAvailable : CastState()
+        data object NotConnected : CastState()
+        data object Connecting : CastState()
         data class Casting(val deviceName: String) : CastState()
     }
 

app/src/main/kotlin/com/arflix/tv/data/api/StalkerApi.kt

@@ -40,6 +40,8 @@ class StalkerApi(
             token = parsed?.js?.token ?: return false
             true
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             System.err.println("[Stalker] Handshake failed: ${e.message}")
             false
         }
@@ -93,6 +95,8 @@ class StalkerApi(
                 page++
             }
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             System.err.println("[Stalker] Get channels failed: ${e.message}")
         }
         return channels
@@ -107,6 +111,8 @@ class StalkerApi(
             val parsed = gson.fromJson(response, StalkerLinkResponse::class.java)
             parsed?.js?.cmd?.replace("ffmpeg ", "")?.trim()
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             System.err.println("[Stalker] Resolve stream failed: ${e.message}")
             null
         }

app/src/main/kotlin/com/arflix/tv/data/api/YouTubeExtractor.kt

@@ -182,6 +182,8 @@ class InAppYouTubeExtractor @Inject constructor() {
         } catch (e: kotlinx.coroutines.CancellationException) {
             throw e
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Log.w(TAG, "[$videoId] extraction failed: ${e.message}")
             null
         }
@@ -221,6 +223,8 @@ class InAppYouTubeExtractor @Inject constructor() {
                     } catch (e: kotlinx.coroutines.CancellationException) {
                         throw e
                     } catch (e: Exception) {
+                        if (e is kotlinx.coroutines.CancellationException) throw e
+
                         val msg = e.message.orEmpty()
                         if (msg.contains("401") || msg.contains("403")) keyRejected = true
                         null

app/src/main/kotlin/com/arflix/tv/data/api/YoutubeChunkedDataSourceFactory.kt

@@ -123,6 +123,8 @@ class YoutubeChunkedDataSourceFactory(
                     openNextChunk()
                     upstream.read(buffer, offset, length)
                 } catch (e: Exception) {
+                    if (e is kotlinx.coroutines.CancellationException) throw e
+
                     Log.w(TAG, "Failed to open next chunk at $currentChunkStart: ${e.message}")
                     C.RESULT_END_OF_INPUT
                 }

app/src/main/kotlin/com/arflix/tv/data/local/PluginDataStore.kt

@@ -73,6 +73,8 @@ class PluginDataStore @Inject constructor(
                 try {
                     moshi.adapter<List<PluginRepository>>(repoListType).fromJson(json) ?: emptyList()
                 } catch (e: Exception) {
+                    if (e is kotlinx.coroutines.CancellationException) throw e
+
                     emptyList()
                 }
             } ?: emptyList()
@@ -124,6 +126,8 @@ class PluginDataStore @Inject constructor(
                 try {
                     moshi.adapter<List<ScraperInfo>>(scraperListType).fromJson(json) ?: emptyList()
                 } catch (e: Exception) {
+                    if (e is kotlinx.coroutines.CancellationException) throw e
+
                     emptyList()
                 }
             } ?: emptyList()
@@ -219,6 +223,8 @@ class PluginDataStore @Inject constructor(
                 @Suppress("UNCHECKED_CAST")
                 moshi.adapter<Map<String, Map<String, Any>>>(settingsMapType).fromJson(json) ?: emptyMap()
             } catch (e: Exception) {
+                if (e is kotlinx.coroutines.CancellationException) throw e
+
                 emptyMap()
             }
         } ?: emptyMap()
@@ -235,6 +241,8 @@ class PluginDataStore @Inject constructor(
                 moshi.adapter<Map<String, Map<String, Any>>>(settingsMapType).fromJson(json)?.toMutableMap()
                     ?: mutableMapOf()
             } catch (e: Exception) {
+                if (e is kotlinx.coroutines.CancellationException) throw e
+
                 mutableMapOf()
             }
         } ?: mutableMapOf()

app/src/main/kotlin/com/arflix/tv/data/repository/AnimeScoreRepository.kt

@@ -68,7 +68,7 @@ class AnimeScoreRepository @Inject constructor(
         if (cached != null || malIdCache.containsKey(imdbId)) return cached
 
         val resolved = withTimeoutOrNull(2_000L) {
-            runCatching { armApi.resolve(imdbId).firstOrNull()?.myanimelist }.getOrNull()
+            try { armApi.resolve(imdbId).firstOrNull()?.myanimelist } catch (e: kotlinx.coroutines.CancellationException) { throw e } catch (e: Exception) { null }
         }
         malIdCache[imdbId] = resolved
         return resolved
@@ -79,7 +79,7 @@ class AnimeScoreRepository @Inject constructor(
         if (cached != null || scoreCache.containsKey(malId)) return cached
 
         val score = withTimeoutOrNull(2_000L) {
-            runCatching { jikanApi.getAnime(malId).data?.score }.getOrNull()
+            try { jikanApi.getAnime(malId).data?.score } catch (e: kotlinx.coroutines.CancellationException) { throw e } catch (e: Exception) { null }
         }
         scoreCache[malId] = score
         return score

app/src/main/kotlin/com/arflix/tv/data/repository/AuthRepository.kt

@@ -208,7 +208,7 @@ internal fun accountSyncPayloadSaveSucceeded(
     userSettingsSaved: Boolean,
     profileAddonsSaved: Boolean
 ): Boolean {
-    return accountSyncSaved || userSettingsSaved
+    return accountSyncSaved || userSettingsSaved || profileAddonsSaved
 }
 
 private fun accountSyncPayloadsMatch(expected: String, actual: String?): Boolean {
@@ -344,8 +344,8 @@ private fun com.google.gson.JsonObject.booleanValue(key: String): Boolean {
  * Authentication state
  */
 sealed class AuthState {
-    object Loading : AuthState()
-    object NotAuthenticated : AuthState()
+    data object Loading : AuthState()
+    data object NotAuthenticated : AuthState()
     data class Authenticated(
         val userId: String,
         val email: String,
@@ -471,6 +471,8 @@ class AuthRepository @Inject constructor(
                     }
                 }
             } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             }
 
             // Second try: Import from cached tokens
@@ -487,6 +489,8 @@ class AuthRepository @Inject constructor(
                         storeSession(session)
                     }
                 } catch (e: Exception) {
+                if (e is kotlinx.coroutines.CancellationException) throw e
+
                 }
             }
 
@@ -528,6 +532,8 @@ class AuthRepository @Inject constructor(
                 _authState.value = AuthState.NotAuthenticated
             }
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             _authState.value = AuthState.NotAuthenticated
         }
     }
@@ -583,6 +589,8 @@ class AuthRepository @Inject constructor(
                 Result.failure(Exception(message))
             }
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             val message = safeErrorMessage(e, context.getString(R.string.auth_signin_failed))
             _authState.value = AuthState.Error(message)
             AppLogger.breadcrumb("Auth", "email_sign_in_failed ${e::class.java.simpleName}", severity = "warning")
@@ -611,6 +619,8 @@ class AuthRepository @Inject constructor(
                 }
             }
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             val message = safeErrorMessage(e, context.getString(R.string.auth_signup_failed))
             _authState.value = AuthState.Error(message)
             AppLogger.recordException(
@@ -748,6 +758,8 @@ class AuthRepository @Inject constructor(
                 Result.failure(Exception(message))
             }
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             val message = safeErrorMessage(e, context.getString(R.string.auth_signin_failed))
             _authState.value = AuthState.Error(message)
             AppLogger.recordException(
@@ -844,6 +856,8 @@ class AuthRepository @Inject constructor(
             _authState.value = AuthState.Error(context.getString(R.string.auth_failed_parse_google))
             Result.failure(e)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             _authState.value = AuthState.Error(e.message ?: context.getString(R.string.auth_google_failed))
             Result.failure(e)
         }
@@ -912,6 +926,8 @@ class AuthRepository @Inject constructor(
 
             result
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             null
         }
     }
@@ -934,6 +950,8 @@ class AuthRepository @Inject constructor(
             traktRepositoryProvider.get().setUserId(userId)
             traktRepositoryProvider.get().syncLocalTokensToProfileIfNeeded()
         } catch (e: Exception) {
+        if (e is kotlinx.coroutines.CancellationException) throw e
+
         }
 
         return UserProfile(
@@ -977,6 +995,8 @@ class AuthRepository @Inject constructor(
             _userProfile.value = profile
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1089,6 +1109,8 @@ class AuthRepository @Inject constructor(
             storeSession(refreshed)
             refreshed.accessToken
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             null
         }
     }
@@ -1131,6 +1153,8 @@ class AuthRepository @Inject constructor(
                     accessToken
                 }
             } catch (e: Exception) {
+                if (e is kotlinx.coroutines.CancellationException) throw e
+
                 null
             }
         }
@@ -1147,6 +1171,8 @@ class AuthRepository @Inject constructor(
                 supabase.auth.loadFromStorage(false)
                 session = supabase.auth.currentSessionOrNull()
             } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             }
         }
         if (session != null && !isSessionExpired(session)) {
@@ -1165,6 +1191,8 @@ class AuthRepository @Inject constructor(
             storeSession(refreshed)
             refreshed
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             null
         }
     }
@@ -1204,6 +1232,8 @@ class AuthRepository @Inject constructor(
             val now = Clock.System.now().epochSeconds
             exp <= now + bufferSeconds
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             true
         }
     }
@@ -1212,7 +1242,11 @@ class AuthRepository @Inject constructor(
         // 1. Explicitly save through session manager (for Supabase SDK auto-restore)
         try {
             sessionManager.saveSession(session)
+        } catch (e: kotlinx.coroutines.CancellationException) {
+            throw e
         } catch (e: Exception) {
+        if (e is kotlinx.coroutines.CancellationException) throw e
+
         }
 
         // 2. Also save tokens directly (fallback for manual restoration)
@@ -1261,6 +1295,8 @@ class AuthRepository @Inject constructor(
             )
             JSONObject(payload)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             null
         }
     }
@@ -1308,6 +1344,8 @@ class AuthRepository @Inject constructor(
 
             Result.success(row?.addons)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1353,6 +1391,8 @@ class AuthRepository @Inject constructor(
             )
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1390,6 +1430,8 @@ class AuthRepository @Inject constructor(
             _userProfile.value = currentProfile.copy(default_subtitle = subtitle)
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1427,6 +1469,8 @@ class AuthRepository @Inject constructor(
             _userProfile.value = currentProfile.copy(auto_play_next = autoPlayNext)
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1679,6 +1723,8 @@ class AuthRepository @Inject constructor(
             }
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1722,6 +1768,8 @@ class AuthRepository @Inject constructor(
             }
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1894,6 +1942,8 @@ class AuthRepository @Inject constructor(
             }
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1927,6 +1977,8 @@ class AuthRepository @Inject constructor(
                 }
             )
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1963,6 +2015,8 @@ class AuthRepository @Inject constructor(
             }
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -1988,6 +2042,8 @@ class AuthRepository @Inject constructor(
                 }
             )
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }
@@ -2023,6 +2079,8 @@ class AuthRepository @Inject constructor(
             )
             Result.success(Unit)
         } catch (e: Exception) {
+            if (e is kotlinx.coroutines.CancellationException) throw e
+
             Result.failure(e)
         }
     }