Merge branch 'main' into fea/live-tv

app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt

@@ -31,17 +31,15 @@ import com.github.damontecres.wholphin.preferences.AppPreferences
 import com.github.damontecres.wholphin.preferences.DefaultUserConfiguration
 import com.github.damontecres.wholphin.preferences.UserPreferences
 import com.github.damontecres.wholphin.ui.CoilConfig
+import com.github.damontecres.wholphin.ui.launchIO
 import com.github.damontecres.wholphin.ui.nav.ApplicationContent
 import com.github.damontecres.wholphin.ui.nav.Destination
 import com.github.damontecres.wholphin.ui.nav.NavigationManager
 import com.github.damontecres.wholphin.ui.theme.WholphinTheme
 import com.github.damontecres.wholphin.util.AppUpgradeHandler
-import com.github.damontecres.wholphin.util.ExceptionHandler
 import com.github.damontecres.wholphin.util.UpdateChecker
 import com.github.damontecres.wholphin.util.profile.createDeviceProfile
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import org.jellyfin.sdk.model.serializer.toUUIDOrNull
 import timber.log.Timber
@@ -72,9 +70,6 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Timber.i("MainActivity.onCreate")
-        lifecycleScope.launch(Dispatchers.IO + ExceptionHandler()) {
-            appUpgradeHandler.run()
-        }
         setContent {
             CoilConfig(okHttpClient, false)
             val appPreferences by userPreferencesDataStore.data.collectAsState(null)
@@ -167,6 +162,13 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        lifecycleScope.launchIO {
+            appUpgradeHandler.run()
+        }
+    }
+
     override fun onPause() {
         if (navigationManager.backStack.lastOrNull() is Destination.Playback) {
             navigationManager.goBack()

app/src/main/java/com/github/damontecres/wholphin/ui/components/RecommendedMovie.kt

@@ -8,6 +8,7 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.github.damontecres.wholphin.data.ServerRepository
 import com.github.damontecres.wholphin.data.model.BaseItem
 import com.github.damontecres.wholphin.preferences.UserPreferences
 import com.github.damontecres.wholphin.ui.OneTimeLaunchedEffect
@@ -41,6 +42,7 @@ class RecommendedMovieViewModel
     @Inject
     constructor(
         private val api: ApiClient,
+        private val serverRepository: ServerRepository,
     ) : ViewModel() {
         val loading = MutableLiveData<LoadingState>(LoadingState.Loading)
         val rows = MutableLiveData<List<HomeRow>>()
@@ -88,6 +90,7 @@ class RecommendedMovieViewModel
 
                 val suggestionsRequest =
                     GetSuggestionsRequest(
+                        userId = serverRepository.currentUser?.id,
                         type = listOf(BaseItemKind.MOVIE),
                     )
                 val suggestedItems = ApiRequestPager(api, suggestionsRequest, GetSuggestionsRequestHandler, viewModelScope)

app/src/main/java/com/github/damontecres/wholphin/ui/components/RecommendedTvShow.kt

@@ -8,6 +8,7 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.github.damontecres.wholphin.data.ServerRepository
 import com.github.damontecres.wholphin.data.model.BaseItem
 import com.github.damontecres.wholphin.preferences.UserPreferences
 import com.github.damontecres.wholphin.ui.OneTimeLaunchedEffect
@@ -43,6 +44,7 @@ class RecommendedTvShowViewModel
     @Inject
     constructor(
         private val api: ApiClient,
+        private val serverRepository: ServerRepository,
     ) : ViewModel() {
         val loading = MutableLiveData<LoadingState>(LoadingState.Loading)
         val rows = MutableLiveData<List<HomeRow>>()
@@ -98,6 +100,7 @@ class RecommendedTvShowViewModel
 
                 val suggestionsRequest =
                     GetSuggestionsRequest(
+                        userId = serverRepository.currentUser?.id,
                         type = listOf(BaseItemKind.SERIES),
                     )
                 val suggestedItems = ApiRequestPager(api, suggestionsRequest, GetSuggestionsRequestHandler, viewModelScope)

app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt

@@ -388,7 +388,7 @@ fun PlaybackPage(
                         LaunchedEffect(Unit) {
                             focusRequester.tryRequestFocus()
                             delay(10.seconds)
-                            segmentCancelled = false
+                            segmentCancelled = true
                         }
                         Button(
                             onClick = {