StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
version updating improvement
David Nashash30ae22240040
diff --git a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt b/app/src/main/java/com/streamvault/app/StreamVaultApp.ktindex d8a478b1..8d5ecdf4 100644--- a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt+++ b/app/src/main/java/com/streamvault/app/StreamVaultApp.kt@@ -123,6 +123,7 @@ class StreamVaultApp : Application(), SingletonImageLoader.Factory {versionCode = result.data.versionCode,releaseUrl = result.data.releaseUrl,downloadUrl = result.data.downloadUrl,+ downloadSha256 = result.data.downloadSha256,releaseNotes = result.data.releaseNotes,publishedAt = result.data.publishedAt)diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.ktindex c1b59a5a..6c20435b 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt@@ -774,7 +774,9 @@ private fun DashboardUpdateCard()Text(text = stringResource(- if (notice.installReady) {+ if (notice.installPermissionRequired) {+ R.string.dashboard_update_install_permission_required+ } else if (notice.installReady) {R.string.dashboard_update_install_ready} else {R.string.dashboard_update_available@@ -786,14 +788,16 @@ private fun DashboardUpdateCard(Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {DashboardActionButton(label = stringResource(- if (notice.installReady) {+ if (notice.installPermissionRequired) {+ R.string.dashboard_update_allow_installs+ } else if (notice.installReady) {R.string.dashboard_update_open_installer} else {R.string.dashboard_update_open_settings}),onClick = {- if (notice.installReady) {+ if (notice.installReady || notice.installPermissionRequired) {onInstallUpdate()} else {onOpenSettings()diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.ktindex b5a5a7f1..fb466eac 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt@@ -2,11 +2,13 @@ package com.streamvault.app.ui.screens.dashboardimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope-import com.streamvault.app.BuildConfigimport com.streamvault.app.ui.model.orderedByRequestedRawIdsimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.data.sync.SyncManager+import com.streamvault.app.update.AppUpdateActionStateimport com.streamvault.app.update.AppUpdateInstaller+import com.streamvault.app.update.isRemoteVersionNewer+import com.streamvault.app.update.latestAppUpdateActionimport com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.AppHomeDashboardShelfimport com.streamvault.domain.model.Category@@ -588,29 +590,49 @@ class DashboardViewModel @Inject constructor(private fun Movie.rawMovieIdsForDashboard(): List<Long> =variants.map { it.rawMovieId }.ifEmpty { listOf(id) }- private fun observeUpdateNotice(): Flow<DashboardUpdateNotice?> = combine(- preferencesRepository.cachedAppUpdateVersionName,- preferencesRepository.cachedAppUpdateVersionCode,- preferencesRepository.downloadedAppUpdateVersionName- ) { latestVersionName, latestVersionCode, downloadedVersionName ->- if (latestVersionName.isNullOrBlank()) {- return@combine null+ private fun observeUpdateNotice(): Flow<DashboardUpdateNotice?> {+ val cachedRelease = combine(+ preferencesRepository.cachedAppUpdateVersionName,+ preferencesRepository.cachedAppUpdateVersionCode,+ preferencesRepository.cachedAppUpdatePublishedAt,+ preferencesRepository.cachedAppUpdateDownloadUrl,+ preferencesRepository.cachedAppUpdateDownloadSha256+ ) { latestVersionName, latestVersionCode, publishedAt, downloadUrl, downloadSha256 ->+ DashboardCachedUpdateRelease(+ latestVersionName = latestVersionName,+ latestVersionCode = latestVersionCode,+ publishedAt = publishedAt,+ downloadUrl = downloadUrl,+ downloadSha256 = downloadSha256+ )}- val updateAvailable = if (latestVersionCode != null && latestVersionCode > BuildConfig.VERSION_CODE) {- true- } else {- compareVersionNames(latestVersionName, BuildConfig.VERSION_NAME) > 0- }+ return cachedRelease.combine(appUpdateInstaller.downloadState) { release, downloadState ->+ val latestVersionName = release.latestVersionName+ if (latestVersionName.isNullOrBlank()) {+ return@combine null+ }- if (!updateAvailable) {- return@combine null- }+ val updateAvailable = isRemoteVersionNewer(+ release.latestVersionCode,+ latestVersionName,+ release.publishedAt+ )+ if (!updateAvailable) {+ return@combine null+ }- DashboardUpdateNotice(- latestVersionName = latestVersionName,- installReady = downloadedVersionName == latestVersionName- )+ DashboardUpdateNotice(+ latestVersionName = latestVersionName,+ downloadSha256 = release.downloadSha256,+ actionState = latestAppUpdateAction(+ latestVersionName = latestVersionName,+ downloadUrl = release.downloadUrl,+ isUpdateAvailable = updateAvailable,+ downloadState = downloadState+ )+ )+ }}private fun buildFeature(@@ -736,20 +758,6 @@ class DashboardViewModel @Inject constructor(}.getOrNull()}- private fun compareVersionNames(left: String, right: String): Int {- val leftParts = left.removePrefix("v").split('.')- val rightParts = right.removePrefix("v").split('.')- val length = maxOf(leftParts.size, rightParts.size)- for (index in 0 until length) {- val leftValue = leftParts.getOrNull(index)?.toIntOrNull() ?: 0- val rightValue = rightParts.getOrNull(index)?.toIntOrNull() ?: 0- if (leftValue != rightValue) {- return leftValue.compareTo(rightValue)- }- }- return 0- }-fun setHomeDashboardShelves(shelves: List<AppHomeDashboardShelf>) {viewModelScope.launch {preferencesRepository.setAppHomeDashboardShelves(@@ -766,7 +774,8 @@ class DashboardViewModel @Inject constructor(fun installDownloadedUpdate() {viewModelScope.launch {- when (val result = appUpdateInstaller.installDownloadedUpdate()) {+ val expectedSha256 = _uiState.value.updateNotice?.downloadSha256+ when (val result = appUpdateInstaller.installDownloadedUpdate(expectedSha256)) {is com.streamvault.domain.model.Result.Error -> {_uiState.value = _uiState.value.copy(userMessage = result.message)}@@ -822,6 +831,14 @@ private data class DashboardSnapshot(val updateNotice: DashboardUpdateNotice?)+private data class DashboardCachedUpdateRelease(+ val latestVersionName: String?,+ val latestVersionCode: Int?,+ val publishedAt: String?,+ val downloadUrl: String?,+ val downloadSha256: String?+)+data class DashboardUiState(val provider: Provider? = null,val homeDashboardShelves: List<AppHomeDashboardShelf> = AppHomeDashboardShelf.defaultOrder,@@ -852,8 +869,15 @@ data class DashboardUiState(data class DashboardUpdateNotice(val latestVersionName: String,+ val downloadSha256: String?,+ val actionState: AppUpdateActionState+) {val installReady: Boolean-)+ get() = actionState == AppUpdateActionState.InstallLatest++ val installPermissionRequired: Boolean+ get() = actionState == AppUpdateActionState.InstallPermissionRequired+}data class DashboardProviderHealth(val status: ProviderStatus = ProviderStatus.UNKNOWN,diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActions.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActions.ktindex df9e7942..c2bc3895 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActions.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateActions.kt@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.updateimport kotlinx.coroutines.launchimport com.streamvault.app.R-import com.streamvault.app.update.AppUpdateDownloadStatus+import com.streamvault.app.update.AppUpdateActionStateimport com.streamvault.app.update.AppUpdateInstallerimport com.streamvault.app.update.GitHubReleaseCheckerimport com.streamvault.data.preferences.PreferencesRepository@@ -30,7 +30,7 @@ internal class SettingsAppUpdateActions(fun checkForAppUpdates(scope: CoroutineScope,manual: Boolean,- isRemoteVersionNewer: (Int?, String) -> Boolean,+ isRemoteVersionNewer: (Int?, String, String?) -> Boolean,autoDownload: Boolean = false) {if (updateCheckInFlight) return@@ -64,12 +64,26 @@ internal class SettingsAppUpdateActions(versionCode = release.versionCode,releaseUrl = release.releaseUrl,downloadUrl = release.downloadUrl,+ downloadSha256 = release.downloadSha256,releaseNotes = release.releaseNotes,publishedAt = release.publishedAt)val updateAvailable = isRemoteVersionNewer(release.versionCode,- release.versionName+ release.versionName,+ release.publishedAt+ )+ var latestUpdateModel = AppUpdateUiModel(+ latestVersionName = release.versionName,+ latestVersionCode = release.versionCode,+ releaseUrl = release.releaseUrl,+ downloadUrl = release.downloadUrl,+ downloadSha256 = release.downloadSha256,+ releaseNotes = release.releaseNotes,+ publishedAt = release.publishedAt,+ isUpdateAvailable = updateAvailable,+ lastCheckedAt = checkedAt,+ errorMessage = null)uiState.update {it.copy(@@ -83,27 +97,17 @@ internal class SettingsAppUpdateActions(} else {it.userMessage},- appUpdate = AppUpdateUiModel(- latestVersionName = release.versionName,- latestVersionCode = release.versionCode,- releaseUrl = release.releaseUrl,- downloadUrl = release.downloadUrl,- releaseNotes = release.releaseNotes,- publishedAt = release.publishedAt,- isUpdateAvailable = updateAvailable,- lastCheckedAt = checkedAt,- errorMessage = null- ).withDownloadState(it.appUpdate.toDownloadState())+ appUpdate = latestUpdateModel.withDownloadState(it.appUpdate.toDownloadState()))}- appUpdateInstaller.refreshState()- if (autoDownload && updateAvailable) {- val currentDownloadStatus = appUpdateInstaller.downloadState.value.status- if (currentDownloadStatus != AppUpdateDownloadStatus.Downloading &&- currentDownloadStatus != AppUpdateDownloadStatus.Downloaded- ) {- downloadLatestUpdate(scope)- }+ val refreshedDownloadState = appUpdateInstaller.refreshState()+ latestUpdateModel = latestUpdateModel.withDownloadState(refreshedDownloadState)+ uiState.update { it.copy(appUpdate = latestUpdateModel) }+ if (autoDownload &&+ updateAvailable &&+ latestUpdateModel.latestActionState() == AppUpdateActionState.DownloadLatest+ ) {+ downloadLatestUpdate(scope)}}Result.Loading -> {@@ -135,7 +139,7 @@ internal class SettingsAppUpdateActions(fun installDownloadedUpdate(scope: CoroutineScope) {scope.launch {- when (val result = appUpdateInstaller.installDownloadedUpdate()) {+ when (val result = appUpdateInstaller.installDownloadedUpdate(uiState.value.appUpdate.downloadSha256)) {is Result.Error -> uiState.update { it.copy(userMessage = result.message) }is Result.Success -> uiState.update {it.copy(userMessage = appContext.getString(R.string.settings_update_install_started))diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateFormatting.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateFormatting.ktindex 7ab66078..3da8ebd6 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateFormatting.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateFormatting.kt@@ -1,6 +1,7 @@package com.streamvault.app.ui.screens.settingsimport com.streamvault.app.R+import com.streamvault.app.update.AppUpdateActionStateimport com.streamvault.app.update.AppUpdateDownloadStatusimport java.text.DateFormat@@ -11,12 +12,15 @@ internal fun formatLatestReleaseLabel(update: AppUpdateUiModel, context: android}internal fun formatUpdateStatusLabel(update: AppUpdateUiModel, context: android.content.Context): String {- val downloadedReleaseMatchesLatest = update.downloadedVersionName != null &&- (update.latestVersionName == null || update.downloadedVersionName == update.latestVersionName)return when {update.errorMessage != null -> context.getString(R.string.settings_update_status_check_failed)update.downloadStatus == AppUpdateDownloadStatus.Downloading -> context.getString(R.string.settings_update_status_downloading)- update.downloadStatus == AppUpdateDownloadStatus.Downloaded && downloadedReleaseMatchesLatest -> context.getString(R.string.settings_update_status_ready_to_install)+ update.latestActionState() == AppUpdateActionState.InstallPermissionRequired -> {+ context.getString(R.string.settings_update_status_permission_required)+ }+ update.latestActionState() == AppUpdateActionState.InstallLatest -> {+ context.getString(R.string.settings_update_status_ready_to_install)+ }update.latestVersionName == null -> context.getString(R.string.settings_update_not_checked)update.isUpdateAvailable -> context.getString(R.string.settings_update_status_available)else -> context.getString(R.string.settings_update_status_current)@@ -31,27 +35,15 @@ internal fun formatUpdateCheckTimeLabel(timestamp: Long?, context: android.conte}internal fun shouldShowUpdateDownloadAction(update: AppUpdateUiModel): Boolean {- val downloadedReleaseMatchesLatest = update.downloadedVersionName != null &&- (update.latestVersionName == null || update.downloadedVersionName == update.latestVersionName)- return when (update.downloadStatus) {- AppUpdateDownloadStatus.Downloading,- AppUpdateDownloadStatus.Downloaded -> downloadedReleaseMatchesLatest || (update.isUpdateAvailable && !update.downloadUrl.isNullOrBlank())- else -> update.isUpdateAvailable && !update.downloadUrl.isNullOrBlank()- }+ return update.latestActionState() != AppUpdateActionState.None}internal fun formatUpdateDownloadLabel(update: AppUpdateUiModel, context: android.content.Context): String {- val downloadedReleaseMatchesLatest = update.downloadedVersionName != null &&- (update.latestVersionName == null || update.downloadedVersionName == update.latestVersionName)- return when (update.downloadStatus) {- AppUpdateDownloadStatus.Downloading -> context.getString(R.string.settings_update_download_in_progress)- AppUpdateDownloadStatus.Downloaded -> {- if (downloadedReleaseMatchesLatest) {- context.getString(R.string.settings_update_install_action)- } else {- context.getString(R.string.settings_update_download_action)- }- }- else -> context.getString(R.string.settings_update_download_action)+ return when (update.latestActionState()) {+ AppUpdateActionState.Downloading -> context.getString(R.string.settings_update_download_in_progress)+ AppUpdateActionState.InstallLatest -> context.getString(R.string.settings_update_install_action)+ AppUpdateActionState.InstallPermissionRequired -> context.getString(R.string.settings_update_install_permission_action)+ AppUpdateActionState.DownloadLatest -> context.getString(R.string.settings_update_download_action)+ AppUpdateActionState.None -> context.getString(R.string.settings_update_download_action)}-}\ No newline at end of file+}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModels.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModels.ktindex fb989791..a30ab310 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModels.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModels.kt@@ -1,25 +1,26 @@package com.streamvault.app.ui.screens.settings-import com.streamvault.app.BuildConfig+import com.streamvault.app.update.AppUpdateActionStateimport com.streamvault.app.update.AppUpdateDownloadStateimport com.streamvault.app.update.AppUpdateDownloadStatus-import com.streamvault.app.update.AppUpdateChannelimport com.streamvault.app.update.GitHubReleaseInfo-import java.time.Instant-import kotlin.math.max+import com.streamvault.app.update.isRemoteVersionNewer+import com.streamvault.app.update.latestAppUpdateActiondata class AppUpdateUiModel(val latestVersionName: String? = null,val latestVersionCode: Int? = null,val releaseUrl: String? = null,val downloadUrl: String? = null,+ val downloadSha256: String? = null,val releaseNotes: String = "",val publishedAt: String? = null,val isUpdateAvailable: Boolean = false,val lastCheckedAt: Long? = null,val errorMessage: String? = null,val downloadStatus: AppUpdateDownloadStatus = AppUpdateDownloadStatus.Idle,- val downloadedVersionName: String? = null+ val downloadedVersionName: String? = null,+ val installPermissionRequired: Boolean = false)internal fun AppUpdateUiModel.toReleaseInfoOrNull(): GitHubReleaseInfo? {@@ -30,6 +31,7 @@ internal fun AppUpdateUiModel.toReleaseInfoOrNull(): GitHubReleaseInfo? {versionCode = latestVersionCode,releaseUrl = releaseUrl,downloadUrl = downloadUrl,+ downloadSha256 = downloadSha256,releaseNotes = releaseNotes,publishedAt = publishedAt)@@ -38,14 +40,25 @@ internal fun AppUpdateUiModel.toReleaseInfoOrNull(): GitHubReleaseInfo? {internal fun AppUpdateUiModel.withDownloadState(downloadState: AppUpdateDownloadState): AppUpdateUiModel {return copy(downloadStatus = downloadState.status,- downloadedVersionName = downloadState.versionName+ downloadedVersionName = downloadState.versionName,+ installPermissionRequired = downloadState.installPermissionRequired)}internal fun AppUpdateUiModel.toDownloadState(): AppUpdateDownloadState {return AppUpdateDownloadState(status = downloadStatus,- versionName = downloadedVersionName+ versionName = downloadedVersionName,+ installPermissionRequired = installPermissionRequired+ )+}++internal fun AppUpdateUiModel.latestActionState(): AppUpdateActionState {+ return latestAppUpdateAction(+ latestVersionName = latestVersionName,+ downloadUrl = downloadUrl,+ isUpdateAvailable = isUpdateAvailable,+ downloadState = toDownloadState())}@@ -56,6 +69,7 @@ internal fun SettingsPreferenceSnapshot.toCachedAppUpdateUiModel(): AppUpdateUiMlatestVersionCode = cachedAppUpdateVersionCode,releaseUrl = cachedAppUpdateReleaseUrl,downloadUrl = cachedAppUpdateDownloadUrl,+ downloadSha256 = cachedAppUpdateDownloadSha256,releaseNotes = cachedAppUpdateReleaseNotes,publishedAt = cachedAppUpdatePublishedAt,isUpdateAvailable = versionName?.let {@@ -64,91 +78,3 @@ internal fun SettingsPreferenceSnapshot.toCachedAppUpdateUiModel(): AppUpdateUiMlastCheckedAt = lastAppUpdateCheckAt)}--internal fun isRemoteVersionNewer(- remoteVersionCode: Int?,- remoteVersionName: String,- remotePublishedAt: String? = null-): Boolean {- return isRemoteVersionNewerForBuild(- remoteVersionCode = remoteVersionCode,- remoteVersionName = remoteVersionName,- remotePublishedAt = remotePublishedAt,- currentVersionCode = BuildConfig.VERSION_CODE,- currentVersionName = BuildConfig.VERSION_NAME,- currentBuildTimestampUtc = BuildConfig.BUILD_TIMESTAMP_UTC,- currentChannel = AppUpdateChannel.fromCurrentBuild()- )-}--internal fun isRemoteVersionNewerForBuild(- remoteVersionCode: Int?,- remoteVersionName: String,- remotePublishedAt: String?,- currentVersionCode: Int,- currentVersionName: String,- currentBuildTimestampUtc: Long,- currentChannel: AppUpdateChannel-): Boolean {- val remoteDescriptor = parseAppVersionDescriptor(remoteVersionName)- if (remoteDescriptor.channel != currentChannel) {- return false- }-- if (remoteVersionCode != null && remoteVersionCode > currentVersionCode) {- return true- }-- val versionComparison = compareVersionNamesStatic(remoteDescriptor.baseVersionName, parseAppVersionDescriptor(currentVersionName).baseVersionName)- if (versionComparison != 0) {- return versionComparison > 0- }-- if (currentChannel == AppUpdateChannel.Beta) {- val remotePublishedAtMillis = remotePublishedAt.toEpochMillisOrNull() ?: return false- return remotePublishedAtMillis > currentBuildTimestampUtc- }-- return false-}--internal fun compareVersionNamesStatic(left: String, right: String): Int {- val leftParts = left.removePrefix("v").split('.')- val rightParts = right.removePrefix("v").split('.')- val length = max(leftParts.size, rightParts.size)- for (index in 0 until length) {- val leftValue = leftParts.getOrNull(index)?.toIntOrNull() ?: 0- val rightValue = rightParts.getOrNull(index)?.toIntOrNull() ?: 0- if (leftValue != rightValue) {- return leftValue.compareTo(rightValue)- }- }- return 0-}--private data class ParsedAppVersionDescriptor(- val baseVersionName: String,- val channel: AppUpdateChannel-)--private fun parseAppVersionDescriptor(versionName: String): ParsedAppVersionDescriptor {- val normalized = versionName.removePrefix("v").trim()- val betaIndex = normalized.indexOf("-beta", ignoreCase = true)- return if (betaIndex >= 0) {- ParsedAppVersionDescriptor(- baseVersionName = normalized.substring(0, betaIndex),- channel = AppUpdateChannel.Beta- )- } else {- ParsedAppVersionDescriptor(- baseVersionName = normalized,- channel = AppUpdateChannel.Stable- )- }-}--private fun String?.toEpochMillisOrNull(): Long? {- val value = this?.trim().orEmpty()- if (value.isEmpty()) return null- return runCatching { Instant.parse(value).toEpochMilli() }.getOrNull()-}\ No newline at end of filediff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.ktindex 2dc6c054..2a3b1151 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt@@ -21,6 +21,7 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.app.BuildConfigimport com.streamvault.app.R+import com.streamvault.app.update.AppUpdateActionStateimport com.streamvault.app.ui.interaction.TvClickableSurfaceimport com.streamvault.app.ui.theme.OnSurfaceimport com.streamvault.app.ui.theme.OnSurfaceDim@@ -326,10 +327,12 @@ internal fun LazyListScope.settingsAboutSection(label = stringResource(R.string.settings_update_download),value = formatUpdateDownloadLabel(uiState.appUpdate, context),onClick = {- if (uiState.appUpdate.downloadStatus == com.streamvault.app.update.AppUpdateDownloadStatus.Downloaded) {- onInstallDownloadedUpdate()- } else if (uiState.appUpdate.downloadStatus != com.streamvault.app.update.AppUpdateDownloadStatus.Downloading) {- onDownloadLatestUpdate()+ when (uiState.appUpdate.latestActionState()) {+ AppUpdateActionState.InstallLatest,+ AppUpdateActionState.InstallPermissionRequired -> onInstallDownloadedUpdate()+ AppUpdateActionState.DownloadLatest -> onDownloadLatestUpdate()+ AppUpdateActionState.Downloading,+ AppUpdateActionState.None -> Unit}})diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsObserverRegistrations.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsObserverRegistrations.ktindex e773889f..77c2593e 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsObserverRegistrations.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsObserverRegistrations.kt@@ -1,6 +1,7 @@package com.streamvault.app.ui.screens.settingsimport android.app.Application+import com.streamvault.app.update.isRemoteVersionNewerimport com.streamvault.app.update.AppUpdateInstallerimport com.streamvault.data.local.dao.ProgramDaoimport com.streamvault.data.preferences.PreferencesRepositorydiff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.ktindex 5d3b0b70..ae0035cf 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt@@ -120,6 +120,7 @@ internal data class SettingsPreferenceSnapshot(val cachedAppUpdateVersionCode: Int?,val cachedAppUpdateReleaseUrl: String?,val cachedAppUpdateDownloadUrl: String?,+ val cachedAppUpdateDownloadSha256: String?,val cachedAppUpdateReleaseNotes: String,val cachedAppUpdatePublishedAt: String?)diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.ktindex b4ac7fe3..8fb45984 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt@@ -83,6 +83,7 @@ internal fun SettingsUiState.applyPreferenceSnapshot(snapshot: SettingsPreferencappUpdate = cachedAppUpdate.copy(downloadStatus = appUpdate.downloadStatus,downloadedVersionName = appUpdate.downloadedVersionName,+ installPermissionRequired = appUpdate.installPermissionRequired,errorMessage = appUpdate.errorMessage))diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.ktindex fcc1e2c7..b75cea1c 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt@@ -118,6 +118,7 @@ internal fun observeSettingsPreferenceSnapshot(cachedAppUpdateVersionCode = null,cachedAppUpdateReleaseUrl = null,cachedAppUpdateDownloadUrl = null,+ cachedAppUpdateDownloadSha256 = null,cachedAppUpdateReleaseNotes = "",cachedAppUpdatePublishedAt = null)@@ -269,6 +270,8 @@ internal fun observeSettingsPreferenceSnapshot(snapshot.copy(cachedAppUpdateReleaseUrl = releaseUrl)}.combine(preferencesRepository.cachedAppUpdateDownloadUrl) { snapshot, downloadUrl ->snapshot.copy(cachedAppUpdateDownloadUrl = downloadUrl)+ }.combine(preferencesRepository.cachedAppUpdateDownloadSha256) { snapshot, downloadSha256 ->+ snapshot.copy(cachedAppUpdateDownloadSha256 = downloadSha256)}.combine(preferencesRepository.cachedAppUpdateReleaseNotes) { snapshot, releaseNotes ->snapshot.copy(cachedAppUpdateReleaseNotes = releaseNotes)}.combine(preferencesRepository.cachedAppUpdatePublishedAt) { snapshot, publishedAt ->diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.ktindex a35e7380..e05838dc 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt@@ -14,11 +14,9 @@ import com.streamvault.app.tvinput.TvInputChannelSyncManagerimport com.streamvault.app.ui.model.LiveTvChannelModeimport com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityModeimport com.streamvault.app.ui.model.VodViewMode-import com.streamvault.app.update.AppUpdateDownloadState-import com.streamvault.app.update.AppUpdateDownloadStatusimport com.streamvault.app.update.AppUpdateInstallerimport com.streamvault.app.update.GitHubReleaseChecker-import com.streamvault.app.update.GitHubReleaseInfo+import com.streamvault.app.update.isRemoteVersionNewerimport com.streamvault.data.local.dao.ProgramDaoimport com.streamvault.data.local.dao.XtreamIndexJobDaoimport com.streamvault.data.local.dao.XtreamLiveOnboardingDaodiff --git a/app/src/main/java/com/streamvault/app/update/AppUpdateInstaller.kt b/app/src/main/java/com/streamvault/app/update/AppUpdateInstaller.ktindex 552b94e2..c1aab712 100644--- a/app/src/main/java/com/streamvault/app/update/AppUpdateInstaller.kt+++ b/app/src/main/java/com/streamvault/app/update/AppUpdateInstaller.kt@@ -35,7 +35,8 @@ import javax.inject.Singletondata class AppUpdateDownloadState(val status: AppUpdateDownloadStatus = AppUpdateDownloadStatus.Idle,val versionName: String? = null,- val downloadId: Long? = null+ val downloadId: Long? = null,+ val installPermissionRequired: Boolean = false)enum class AppUpdateDownloadStatus {@@ -84,11 +85,7 @@ class AppUpdateInstaller @Inject constructor(if (downloadId == null) {preferencesRepository.setAppUpdateDownloadVersionName(null)val restoredState = if (downloadedVersionName != null && apkFile?.exists() == true) {- AppUpdateDownloadState(- status = AppUpdateDownloadStatus.Downloaded,- versionName = downloadedVersionName,- downloadId = null- )+ downloadedState(downloadedVersionName)} else {if (downloadedVersionName != null) {preferencesRepository.setDownloadedAppUpdateVersionName(null)@@ -106,10 +103,7 @@ class AppUpdateInstaller @Inject constructor(preferencesRepository.setAppUpdateDownloadId(null)preferencesRepository.setAppUpdateDownloadVersionName(null)val fallbackState = if (downloadedVersionName != null && apkFile?.exists() == true) {- AppUpdateDownloadState(- status = AppUpdateDownloadStatus.Downloaded,- versionName = downloadedVersionName- )+ downloadedState(downloadedVersionName)} else {preferencesRepository.setDownloadedAppUpdateVersionName(null)AppUpdateDownloadState(status = AppUpdateDownloadStatus.Failed)@@ -135,11 +129,7 @@ class AppUpdateInstaller @Inject constructor(val completedApkFile = trackedVersionName?.let(::apkFileForVersion)if (trackedVersionName != null && completedApkFile?.exists() == true) {preferencesRepository.setDownloadedAppUpdateVersionName(trackedVersionName)- AppUpdateDownloadState(- status = AppUpdateDownloadStatus.Downloaded,- versionName = trackedVersionName,- downloadId = null- )+ downloadedState(trackedVersionName)} else {preferencesRepository.setDownloadedAppUpdateVersionName(null)AppUpdateDownloadState(@@ -229,13 +219,21 @@ class AppUpdateInstaller @Inject constructor(return@withContext Result.error("No downloaded update is ready to install")}- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !context.packageManager.canRequestPackageInstalls()) {+ if (requiresInstallPermission()) {val settingsIntent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).apply {data = Uri.parse("package:${context.packageName}")addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)}- context.startActivity(settingsIntent)- return@withContext Result.error("Allow installs from this app, then try Install update again")+ val permissionRequiredState = currentState.copy(installPermissionRequired = true)+ _downloadState.value = permissionRequiredState+ return@withContext try {+ context.startActivity(settingsIntent)+ Result.error("Allow installs from this app, then try Install update again")+ } catch (error: ActivityNotFoundException) {+ Result.error("Open Android settings, allow installs from this app, then try Install update again", error)+ } catch (error: SecurityException) {+ Result.error("The install permission settings screen could not be opened", error)+ }}val apkFile = apkFileForVersion(currentState.versionName)@@ -317,6 +315,20 @@ class AppUpdateInstaller @Inject constructor(return File(downloadsDir, "StreamVault-$sanitizedVersion.apk")}+ private fun downloadedState(versionName: String): AppUpdateDownloadState {+ return AppUpdateDownloadState(+ status = AppUpdateDownloadStatus.Downloaded,+ versionName = versionName,+ downloadId = null,+ installPermissionRequired = requiresInstallPermission()+ )+ }++ private fun requiresInstallPermission(): Boolean {+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&+ !context.packageManager.canRequestPackageInstalls()+ }+private fun registerDownloadReceiver() {val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {diff --git a/app/src/main/java/com/streamvault/app/update/AppUpdateVersionPolicy.kt b/app/src/main/java/com/streamvault/app/update/AppUpdateVersionPolicy.ktnew file mode 100644index 00000000..304330b7--- /dev/null+++ b/app/src/main/java/com/streamvault/app/update/AppUpdateVersionPolicy.kt@@ -0,0 +1,145 @@+package com.streamvault.app.update++import com.streamvault.app.BuildConfig+import java.time.Instant+import kotlin.math.max++enum class AppUpdateActionState {+ None,+ DownloadLatest,+ Downloading,+ InstallLatest,+ InstallPermissionRequired+}++fun isRemoteVersionNewer(+ remoteVersionCode: Int?,+ remoteVersionName: String,+ remotePublishedAt: String? = null+): Boolean {+ return isRemoteVersionNewerForBuild(+ remoteVersionCode = remoteVersionCode,+ remoteVersionName = remoteVersionName,+ remotePublishedAt = remotePublishedAt,+ currentVersionCode = BuildConfig.VERSION_CODE,+ currentVersionName = BuildConfig.VERSION_NAME,+ currentBuildTimestampUtc = BuildConfig.BUILD_TIMESTAMP_UTC,+ currentChannel = AppUpdateChannel.fromCurrentBuild()+ )+}++fun isRemoteVersionNewerForBuild(+ remoteVersionCode: Int?,+ remoteVersionName: String,+ remotePublishedAt: String?,+ currentVersionCode: Int,+ currentVersionName: String,+ currentBuildTimestampUtc: Long,+ currentChannel: AppUpdateChannel+): Boolean {+ val remoteDescriptor = parseAppVersionDescriptor(remoteVersionName)+ if (remoteDescriptor.channel != currentChannel) {+ return false+ }++ if (remoteVersionCode != null && remoteVersionCode > currentVersionCode) {+ return true+ }++ val versionComparison = compareVersionNamesStatic(+ remoteDescriptor.baseVersionName,+ parseAppVersionDescriptor(currentVersionName).baseVersionName+ )+ if (versionComparison != 0) {+ return versionComparison > 0+ }++ if (currentChannel == AppUpdateChannel.Beta) {+ val remotePublishedAtMillis = remotePublishedAt.toEpochMillisOrNull() ?: return false+ return remotePublishedAtMillis > currentBuildTimestampUtc+ }++ return false+}++fun compareVersionNamesStatic(left: String, right: String): Int {+ val leftParts = left.removePrefix("v").split('.')+ val rightParts = right.removePrefix("v").split('.')+ val length = max(leftParts.size, rightParts.size)+ for (index in 0 until length) {+ val leftValue = leftParts.getOrNull(index)?.toIntOrNull() ?: 0+ val rightValue = rightParts.getOrNull(index)?.toIntOrNull() ?: 0+ if (leftValue != rightValue) {+ return leftValue.compareTo(rightValue)+ }+ }+ return 0+}++fun isLatestAppUpdateDownloaded(+ latestVersionName: String?,+ downloadState: AppUpdateDownloadState+): Boolean {+ return !latestVersionName.isNullOrBlank() &&+ downloadState.status == AppUpdateDownloadStatus.Downloaded &&+ downloadState.versionName == latestVersionName+}++fun latestAppUpdateAction(+ latestVersionName: String?,+ downloadUrl: String?,+ isUpdateAvailable: Boolean,+ downloadState: AppUpdateDownloadState+): AppUpdateActionState {+ if (latestVersionName.isNullOrBlank()) {+ return AppUpdateActionState.None+ }++ val latestDownloaded = isLatestAppUpdateDownloaded(latestVersionName, downloadState)+ if (latestDownloaded) {+ return if (downloadState.installPermissionRequired) {+ AppUpdateActionState.InstallPermissionRequired+ } else {+ AppUpdateActionState.InstallLatest+ }+ }++ if (downloadState.status == AppUpdateDownloadStatus.Downloading &&+ downloadState.versionName == latestVersionName+ ) {+ return AppUpdateActionState.Downloading+ }++ return if (isUpdateAvailable && !downloadUrl.isNullOrBlank()) {+ AppUpdateActionState.DownloadLatest+ } else {+ AppUpdateActionState.None+ }+}++private data class ParsedAppVersionDescriptor(+ val baseVersionName: String,+ val channel: AppUpdateChannel+)++private fun parseAppVersionDescriptor(versionName: String): ParsedAppVersionDescriptor {+ val normalized = versionName.removePrefix("v").trim()+ val betaIndex = normalized.indexOf("-beta", ignoreCase = true)+ return if (betaIndex >= 0) {+ ParsedAppVersionDescriptor(+ baseVersionName = normalized.substring(0, betaIndex),+ channel = AppUpdateChannel.Beta+ )+ } else {+ ParsedAppVersionDescriptor(+ baseVersionName = normalized,+ channel = AppUpdateChannel.Stable+ )+ }+}++private fun String?.toEpochMillisOrNull(): Long? {+ val value = this?.trim().orEmpty()+ if (value.isEmpty()) return null+ return runCatching { Instant.parse(value).toEpochMilli() }.getOrNull()+}diff --git a/app/src/main/java/com/streamvault/app/update/GitHubReleaseChecker.kt b/app/src/main/java/com/streamvault/app/update/GitHubReleaseChecker.ktindex 07c0064e..cd176f33 100644--- a/app/src/main/java/com/streamvault/app/update/GitHubReleaseChecker.kt+++ b/app/src/main/java/com/streamvault/app/update/GitHubReleaseChecker.kt@@ -22,6 +22,7 @@ data class GitHubReleaseInfo(val versionCode: Int?,val releaseUrl: String,val downloadUrl: String?,+ val downloadSha256: String?,val releaseNotes: String,val publishedAt: String?)@@ -78,14 +79,15 @@ class GitHubReleaseChecker @Inject constructor(if (releaseUrl.isBlank()) {return@withContext Result.error("Update check failed: latest release URL is not HTTPS")}- val downloadUrl = findApkAssetUrl(assets, updateChannel)+ val downloadAsset = findApkAsset(assets, updateChannel)return@withContext Result.success(GitHubReleaseInfo(versionName = parsedTag.versionName,versionCode = parsedTag.versionCode,releaseUrl = releaseUrl,- downloadUrl = downloadUrl,+ downloadUrl = downloadAsset?.downloadUrl,+ downloadSha256 = downloadAsset?.sha256,releaseNotes = notes,publishedAt = json.optString("published_at").takeIf { it.isNotBlank() })@@ -109,8 +111,8 @@ class GitHubReleaseChecker @Inject constructor(if (!release.optBoolean("prerelease")) continueval tagName = release.optString("tag_name")if (!tagName.contains("-beta", ignoreCase = true)) continue- val downloadUrl = findApkAssetUrl(release.optJSONArray("assets"), updateChannel)- if (downloadUrl != null) {+ val downloadAsset = findApkAsset(release.optJSONArray("assets"), updateChannel)+ if (downloadAsset != null) {return release}}@@ -147,35 +149,39 @@ class GitHubReleaseChecker @Inject constructor(return Result.success(output.toString(charset.name()))}- private fun findApkAssetUrl(assets: org.json.JSONArray?, updateChannel: AppUpdateChannel): String? {+ private fun findApkAsset(assets: org.json.JSONArray?, updateChannel: AppUpdateChannel): ReleaseApkAsset? {if (assets == null) return null- var fallback: String? = null+ var fallback: ReleaseApkAsset? = nullfor (index in 0 until assets.length()) {val asset = assets.optJSONObject(index) ?: continueval name = asset.optString("name")val url = asset.optString("browser_download_url").takeIf { it.isNotBlank() } ?: continueif (!isHttpsUrl(url)) continue+ val releaseAsset = ReleaseApkAsset(+ downloadUrl = url,+ sha256 = parseReleaseAssetSha256Digest(asset.optString("digest"))+ )when (updateChannel) {AppUpdateChannel.Stable -> {if (name.equals("StreamVault.apk", ignoreCase = true)) {- return url+ return releaseAsset}if (fallback == null &&name.endsWith(".apk", ignoreCase = true) &&!name.contains("beta", ignoreCase = true)) {- fallback = url+ fallback = releaseAsset}}AppUpdateChannel.Beta -> {if (name.equals("StreamVault-beta.apk", ignoreCase = true)) {- return url+ return releaseAsset}if (fallback == null &&name.endsWith(".apk", ignoreCase = true) &&name.contains("beta", ignoreCase = true)) {- fallback = url+ fallback = releaseAsset}}}@@ -183,6 +189,7 @@ class GitHubReleaseChecker @Inject constructor(return fallback}+private fun parseTagVersionInfo(rawTagName: String): ParsedTagVersion {val normalizedTag = rawTagName.trim()val structuredMatch = STRUCTURED_TAG_REGEX.matchEntire(normalizedTag)@@ -209,6 +216,20 @@ class GitHubReleaseChecker @Inject constructor(}}+internal fun parseReleaseAssetSha256Digest(rawDigest: String): String? {+ val value = rawDigest.trim()+ if (!value.startsWith("sha256:", ignoreCase = true)) return null+ val hex = value.substringAfter(':')+ return hex.takeIf { SHA256_HEX_REGEX.matches(it) }?.lowercase()+}++private val SHA256_HEX_REGEX = Regex("""^[a-fA-F0-9]{64}$""")++private data class ReleaseApkAsset(+ val downloadUrl: String,+ val sha256: String?+)+enum class AppUpdateChannel(val id: String, val releaseApiUrl: String) {Stable(id = "stable", releaseApiUrl = GITHUB_RELEASES_LATEST_URL),Beta(id = "beta", releaseApiUrl = GITHUB_RELEASES_LIST_URL);diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex e64e7414..204733cf 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -133,9 +133,11 @@<string name="dashboard_warning_review">Open Provider Details</string><string name="dashboard_update_title">StreamVault %1$s is available</string><string name="dashboard_update_available">A newer app release is cached and ready to review from Settings.</string>- <string name="dashboard_update_install_ready">The latest update has already been downloaded. Open Settings to install it.</string>+ <string name="dashboard_update_install_ready">The latest update has already been downloaded. Open the installer to finish.</string>+ <string name="dashboard_update_install_permission_required">The update is downloaded. Allow installs from StreamVault, then retry installation.</string><string name="dashboard_update_open_settings">Open Updates</string>- <string name="dashboard_update_open_installer">Install From Settings</string>+ <string name="dashboard_update_open_installer">Install Update</string>+ <string name="dashboard_update_allow_installs">Allow Installs</string><string name="dashboard_updated_series_badge">Updated series</string><string name="dashboard_stat_live">%1$d live</string><string name="dashboard_stat_favorites">%1$d favorites</string>@@ -652,6 +654,7 @@<string name="settings_update_download_started">Update download started. Install will be available when it finishes.</string><string name="settings_update_download_unavailable">No downloadable update package is available for this release.</string><string name="settings_update_install_action">Install update</string>+ <string name="settings_update_install_permission_action">Allow installs, then retry</string><string name="settings_update_install_started">Opening the package installer.</string><string name="settings_update_view_release">Open latest release</string><string name="settings_update_release_notes">Release page</string>@@ -662,6 +665,7 @@<string name="settings_update_status_check_failed">Last check failed</string><string name="settings_update_status_downloading">Downloading update</string><string name="settings_update_status_ready_to_install">Ready to install</string>+ <string name="settings_update_status_permission_required">Install permission required</string><string name="settings_update_available_message">StreamVault %1$s is available.</string><string name="settings_update_current_message">You already have the latest StreamVault release.</string><string name="settings_syncing">Syncing data, please wait...</string>diff --git a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModelsTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModelsTest.ktindex 87e108f4..7d14cc19 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModelsTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/screens/settings/SettingsAppUpdateModelsTest.kt@@ -1,7 +1,10 @@package com.streamvault.app.ui.screens.settingsimport com.google.common.truth.Truth.assertThat+import com.streamvault.app.update.AppUpdateActionStateimport com.streamvault.app.update.AppUpdateChannel+import com.streamvault.app.update.AppUpdateDownloadStatus+import com.streamvault.app.update.isRemoteVersionNewerForBuildimport org.junit.Testclass SettingsAppUpdateModelsTest {@@ -80,4 +83,72 @@ class SettingsAppUpdateModelsTest {assertThat(result).isFalse()}-}\ No newline at end of file++ @Test+ fun betaBuildRejectsSameVersionBetaReleaseWhenPublishedAtMissing() {+ val result = isRemoteVersionNewerForBuild(+ remoteVersionCode = 12,+ remoteVersionName = "1.0.11-beta-deadbee",+ remotePublishedAt = null,+ currentVersionCode = 12,+ currentVersionName = "1.0.11-beta",+ currentBuildTimestampUtc = 1_747_216_000_000L,+ currentChannel = AppUpdateChannel.Beta+ )++ assertThat(result).isFalse()+ }++ @Test+ fun downloadedLatestShowsInstallAction() {+ val update = AppUpdateUiModel(+ latestVersionName = "1.0.12",+ downloadUrl = "https://example.com/StreamVault.apk",+ isUpdateAvailable = true,+ downloadStatus = AppUpdateDownloadStatus.Downloaded,+ downloadedVersionName = "1.0.12"+ )++ assertThat(update.latestActionState()).isEqualTo(AppUpdateActionState.InstallLatest)+ }++ @Test+ fun staleDownloadedUpdateShowsDownloadAction() {+ val update = AppUpdateUiModel(+ latestVersionName = "1.0.13",+ downloadUrl = "https://example.com/StreamVault.apk",+ isUpdateAvailable = true,+ downloadStatus = AppUpdateDownloadStatus.Downloaded,+ downloadedVersionName = "1.0.12"+ )++ assertThat(update.latestActionState()).isEqualTo(AppUpdateActionState.DownloadLatest)+ }++ @Test+ fun downloadedLatestWithMissingInstallPermissionShowsPermissionAction() {+ val update = AppUpdateUiModel(+ latestVersionName = "1.0.12",+ downloadUrl = "https://example.com/StreamVault.apk",+ isUpdateAvailable = true,+ downloadStatus = AppUpdateDownloadStatus.Downloaded,+ downloadedVersionName = "1.0.12",+ installPermissionRequired = true+ )++ assertThat(update.latestActionState()).isEqualTo(AppUpdateActionState.InstallPermissionRequired)+ }++ @Test+ fun downloadingLatestShowsDownloadingAction() {+ val update = AppUpdateUiModel(+ latestVersionName = "1.0.12",+ downloadUrl = "https://example.com/StreamVault.apk",+ isUpdateAvailable = true,+ downloadStatus = AppUpdateDownloadStatus.Downloading,+ downloadedVersionName = "1.0.12"+ )++ assertThat(update.latestActionState()).isEqualTo(AppUpdateActionState.Downloading)+ }+}diff --git a/app/src/test/java/com/streamvault/app/update/GitHubReleaseCheckerTest.kt b/app/src/test/java/com/streamvault/app/update/GitHubReleaseCheckerTest.ktnew file mode 100644index 00000000..500fe9ad--- /dev/null+++ b/app/src/test/java/com/streamvault/app/update/GitHubReleaseCheckerTest.kt@@ -0,0 +1,21 @@+package com.streamvault.app.update++import com.google.common.truth.Truth.assertThat+import org.junit.Test++class GitHubReleaseCheckerTest {+ @Test+ fun parseReleaseAssetSha256DigestAcceptsGitHubDigestShape() {+ val digest = "sha256:ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"++ assertThat(parseReleaseAssetSha256Digest(digest))+ .isEqualTo("abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789")+ }++ @Test+ fun parseReleaseAssetSha256DigestRejectsUnsupportedDigest() {+ assertThat(parseReleaseAssetSha256Digest("sha1:abcdef")).isNull()+ assertThat(parseReleaseAssetSha256Digest("sha256:not-a-hash")).isNull()+ assertThat(parseReleaseAssetSha256Digest("")).isNull()+ }+}diff --git a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.ktindex 152c9293..a1564577 100644--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt@@ -217,6 +217,7 @@ class PreferencesRepository @Inject constructor(val APP_UPDATE_LATEST_VERSION_CODE = intPreferencesKey("app_update_latest_version_code")val APP_UPDATE_RELEASE_URL = stringPreferencesKey("app_update_release_url")val APP_UPDATE_DOWNLOAD_URL = stringPreferencesKey("app_update_download_url")+ val APP_UPDATE_DOWNLOAD_SHA256 = stringPreferencesKey("app_update_download_sha256")val APP_UPDATE_RELEASE_NOTES = stringPreferencesKey("app_update_release_notes")val APP_UPDATE_PUBLISHED_AT = stringPreferencesKey("app_update_published_at")val LAST_MAINTENANCE_AT = longPreferencesKey("last_maintenance_at")@@ -643,6 +644,10 @@ class PreferencesRepository @Inject constructor(preferences[PreferencesKeys.APP_UPDATE_DOWNLOAD_URL]?.takeIf { it.isNotBlank() }}+ val cachedAppUpdateDownloadSha256: Flow<String?> = context.dataStore.data.map { preferences ->+ preferences[PreferencesKeys.APP_UPDATE_DOWNLOAD_SHA256]?.takeIf { it.isNotBlank() }+ }+val cachedAppUpdateReleaseNotes: Flow<String> = context.dataStore.data.map { preferences ->preferences[PreferencesKeys.APP_UPDATE_RELEASE_NOTES].orEmpty()}@@ -810,6 +815,7 @@ class PreferencesRepository @Inject constructor(versionCode: Int?,releaseUrl: String?,downloadUrl: String?,+ downloadSha256: String?,releaseNotes: String?,publishedAt: String?) {@@ -819,6 +825,7 @@ class PreferencesRepository @Inject constructor(preferences.remove(PreferencesKeys.APP_UPDATE_LATEST_VERSION_CODE)preferences.remove(PreferencesKeys.APP_UPDATE_RELEASE_URL)preferences.remove(PreferencesKeys.APP_UPDATE_DOWNLOAD_URL)+ preferences.remove(PreferencesKeys.APP_UPDATE_DOWNLOAD_SHA256)preferences.remove(PreferencesKeys.APP_UPDATE_RELEASE_NOTES)preferences.remove(PreferencesKeys.APP_UPDATE_PUBLISHED_AT)} else {@@ -834,6 +841,11 @@ class PreferencesRepository @Inject constructor(} else {preferences[PreferencesKeys.APP_UPDATE_DOWNLOAD_URL] = downloadUrl}+ if (downloadSha256.isNullOrBlank()) {+ preferences.remove(PreferencesKeys.APP_UPDATE_DOWNLOAD_SHA256)+ } else {+ preferences[PreferencesKeys.APP_UPDATE_DOWNLOAD_SHA256] = downloadSha256+ }if (releaseNotes.isNullOrBlank()) {preferences.remove(PreferencesKeys.APP_UPDATE_RELEASE_NOTES)} else {diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex 6ac61e59..5c281659 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -15,6 +15,7 @@ All notable product changes are recorded in this document.### Fixed+- Fixed in-app update handling so downloaded APKs are recognized as install-ready, stale downloaded APKs no longer block newer releases, unknown-sources permission prompts preserve the downloaded update for retry, and Home/Settings use the same channel-aware newer-version logic.- Fixed Xtream raw live MPEG-TS playback using an HLS-specific Media3 TS extractor mode; direct `.ts` live streams now use the standard single-program TS path, improving compatibility with providers whose endless transport streams were failing during startup and retry recovery.- Fixed external-only guide behavior so providers can now strictly avoid supplier Xtream/Stalker guide fallback, clear stale external-vs-provider mapping behavior correctly when policy changes, and resolve channel logos from supplier or matched EPG icons without overwriting stored supplier logos.- Fixed Live TV default-category entry so opening Live TV with a saved default category now moves focus into the first channel in that category instead of leaving focus stranded on the sidebar.