Merge remote-tracking branch 'origin/master' into __sync_origin_branch

Author: WizardOfYendor1

app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java

@@ -612,6 +612,12 @@ protected void addAdditionalRows(MutableObjectAdapter<Row> adapter) {
                 break;
 
             case EPISODE:
+                //Additional Parts
+                if (mBaseItem.getPartCount() != null && mBaseItem.getPartCount() > 0) {
+                    ItemRowAdapter additionalPartsAdapter = new ItemRowAdapter(requireContext(), new GetAdditionalPartsRequest(mBaseItem.getId()), new CardPresenter(), adapter);
+                    addItemRow(adapter, additionalPartsAdapter, 0, getString(R.string.lbl_additional_parts));
+                }
+
                 if (mBaseItem.getSeasonId() != null && mBaseItem.getIndexNumber() != null) {
                     // query index is zero-based but episode no is not
                     ItemRowAdapter nextAdapter = new ItemRowAdapter(requireContext(), BrowsingUtils.createNextEpisodesRequest(mBaseItem.getSeasonId(), mBaseItem.getIndexNumber()), 0, false, true, new CardPresenter(true, 120), adapter);

app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragmentHelper.kt

@@ -159,12 +159,12 @@ fun CustomPlaybackOverlayFragment.recordProgram(program: BaseItemDto, isSeries:
 	lifecycleScope.launch {
 		runCatching {
 			withContext(Dispatchers.IO) {
-				val defaultTimer by api.liveTvApi.getDefaultTimer()
+				val defaultTimer by api.liveTvApi.getDefaultTimer(program.id.toString())
 
 				if (isSeries) {
-					api.liveTvApi.createSeriesTimer(defaultTimer.copy(programId = program.id.toString()))
+					api.liveTvApi.createSeriesTimer(defaultTimer)
 				} else {
-					api.liveTvApi.createTimer(defaultTimer.asTimerInfoDto().copy(programId = program.id.toString()))
+					api.liveTvApi.createTimer(defaultTimer.asTimerInfoDto())
 				}
 			}
 		}.fold(

app/src/main/java/org/jellyfin/androidtv/ui/settings/compat/rememberPreference.kt

@@ -17,7 +17,10 @@ import org.jellyfin.preference.store.PreferenceStore
 fun <ME, MV, T : Any> rememberPreference(store: PreferenceStore<ME, MV>, preference: Preference<T>): MutableState<T> {
 	val mutableState = remember { mutableStateOf(store[preference]) }
 	LaunchedEffect(mutableState.value) {
-		if (store[preference] != mutableState.value) store[preference] = mutableState.value
+		if (store[preference] != mutableState.value) {
+			store[preference] = mutableState.value
+			if (store is AsyncPreferenceStore) store.commit()
+		}
 	}
 	return mutableState
 }