Skip to content

feat(updater): silent background pre-download and instant install for Compose updater #3220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codeiva11 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(updater): silent background pre-download and instant install for Compose updater #3220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions app/src/main/java/com/lagradost/cloudstream3/MainActivityScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ object MainActivityScreen : Screen {
buildSha = activity.currentCommitHash(),
settings = settings,
updater = ApkUpdater
)/*.apply {
onAction(AutoSearchForUpdate) // Remove this for now
}*/
).apply {
onAction(AutoSearchForUpdate)
}
}
}

Expand Down Expand Up @@ -171,6 +171,42 @@ object MainActivityScreen : Screen {
}
}

is GithubUpdateDialogState.InstallProgress -> {
cancelable = false
title = stringResource(R.string.install_update)
body = {
val progress = if (state.total != null && state.total > 0L) {
(state.progress.toFloat() / state.total.toFloat()).coerceIn(0.0f, 1.0f)
} else null

Column(horizontalAlignment = Alignment.CenterHorizontally) {
if (progress != null) {
Text(
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center,
text = "${(progress * 100.0f).toInt()}%"
)
Spacer(modifier = Modifier.height(MaterialTheme.padding.medium))
LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(),
color = MaterialTheme.colorScheme.onBackground,
trackColor = MaterialTheme.colorScheme.surfaceVariant,
progress = { progress }
)
} else {
LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(),
color = MaterialTheme.colorScheme.onBackground,
trackColor = MaterialTheme.colorScheme.surfaceVariant,
)
}
}
}
confirmButton = {}
dismissButton = {}
}

is GithubUpdateDialogState.DownloadProgress -> {
cancelable = false
title = stringResource(R.string.update_notification_downloading)
Expand Down
96 changes: 94 additions & 2 deletions app/src/main/java/com/lagradost/cloudstream3/ui/settings/ApkUpdater.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,101 @@ object ApkUpdater : AppUpdater {
}
}

fun clearOldFiles(activity: Activity) {
fun getCachedUpdateFile(context: Context, versionTag: String): File {
return File(context.cacheDir, "${APP_UPDATE_NAME}_$versionTag.$APP_UPDATE_SUFFIX")
}

suspend fun downloadSilently(
context: Context,
url: String,
versionTag: String,
digest: DigestPair?
): File? = withContext(Dispatchers.IO) {
try {
val targetFile = getCachedUpdateFile(context, versionTag)
if (targetFile.exists() && targetFile.length() > 0) {
return@withContext targetFile
}

clearOldFiles(context)
val request = app.get(url)
val length = request.size
val body = request.body
val tempFile = File.createTempFile(APP_UPDATE_NAME, ".$APP_UPDATE_SUFFIX", context.cacheDir)
body.use { body ->
val readStream = body.byteStream()
tempFile.outputStream().use { writeStream ->
transfer(writeStream, readStream, length ?: body.contentLength(), { _, _ -> }, digest)
}
}

if (tempFile.renameTo(targetFile)) {
targetFile
} else {
tempFile
}
} catch (_: Throwable) {
null
}
}

@Throws
suspend fun installFromFile(
activity: Activity,
file: File,
settings: AppSettings,
installProgress: (Long, Long?) -> Unit
) = withContext(Dispatchers.IO) {
when (settings.updates.apkInstaller.get()) {
0 -> {
val length = file.length()
file.inputStream().use { inputStream ->
var sessionId: Int? = null
val packageInstaller = activity.packageManager.packageInstaller
try {
val installParams =
PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
installParams.setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED)
}
installParams.setSize(length)

sessionId = packageInstaller.createSession(installParams)
val session = packageInstaller.openSession(sessionId)

session.openWrite(activity.packageName, 0, length)
.use { writeStream ->
transfer(writeStream, inputStream, length, installProgress, null)
session.fsync(writeStream)
}

val receiverIntent = Intent(activity, PackageInstallerStatusReceiver::class.java)
val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
} else {
PendingIntent.FLAG_UPDATE_CURRENT
}
val receiverPendingIntent = PendingIntent.getBroadcast(activity, 0, receiverIntent, flags)
session.commit(receiverPendingIntent.intentSender)
session.close()
} catch (t: Throwable) {
sessionId?.let { id ->
packageInstaller.abandonSession(id)
}
throw t
}
}
}
else -> {
openApk(activity, file)
}
}
}

fun clearOldFiles(context: Context) {
// Delete old files
activity.cacheDir.listFiles()?.filter {
context.cacheDir.listFiles()?.filter {
it.name.startsWith(APP_UPDATE_NAME) && it.extension == APP_UPDATE_SUFFIX
}?.forEach {
deleteFileOnExit(it)
Expand Down
76 changes: 66 additions & 10 deletions app/src/main/java/com/lagradost/cloudstream3/ui/settings/GithubViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ data class GithubState(
sealed class GithubUpdateDialogState {
data class Error(val error: Throwable) : GithubUpdateDialogState()
data class DownloadProgress(val progress: Long, val total: Long?) : GithubUpdateDialogState()
data class InstallProgress(val progress: Long, val total: Long?) : GithubUpdateDialogState()
object Loading : GithubUpdateDialogState()
object NoUpdateFound : GithubUpdateDialogState()
data class UpdateFound(
Expand Down Expand Up @@ -153,6 +154,7 @@ class GithubViewModel(

is GithubAction.SkipThisUpdate -> {
settings.updates.skipUpdate.set(action.file.nodeId)
deleteCachedApk(action.file.tagName)
}

GithubAction.AutoSearchForUpdate -> {
Expand All @@ -165,11 +167,12 @@ class GithubViewModel(

is GithubAction.SkipUpdate -> {
settings.updates.skipUpdate.set(action.file.nodeId)
deleteCachedApk(action.file.tagName)
}

is GithubAction.Update -> {
ioSafe {
installUpdate(action.file.downloadUrl, action.file.digest)
installUpdate(action.file)
}
}
}
Expand All @@ -193,22 +196,52 @@ class GithubViewModel(
}
}

private suspend fun installUpdate(url: String, digestPair: String?) = dispatchUpdate {
updater.update(
settings = settings,
url = url,
digest = DigestPair.parse(digestPair),
) { progress, total ->
private suspend fun installUpdate(file: GithubReleases.GithubFile) = dispatchUpdate {
val activity = com.lagradost.cloudstream3.CommonActivity.activity
val cachedFile = activity?.let {
ApkUpdater.getCachedUpdateFile(it, file.tagName)
}

if (activity != null && cachedFile != null && cachedFile.exists() && cachedFile.length() > 0) {
updateState {
copy(
dialog = dialog?.copy(
state = GithubUpdateDialogState.DownloadProgress(
progress = progress,
total = total
state = GithubUpdateDialogState.InstallProgress(
progress = 0,
total = cachedFile.length()
)
)
)
}
ApkUpdater.installFromFile(activity, cachedFile, settings) { progress, total ->
updateState {
copy(
dialog = dialog?.copy(
state = GithubUpdateDialogState.InstallProgress(
progress = progress,
total = total
)
)
)
}
}
} else {
updater.update(
settings = settings,
url = file.downloadUrl,
digest = DigestPair.parse(file.digest),
) { progress, total ->
updateState {
copy(
dialog = dialog?.copy(
state = GithubUpdateDialogState.DownloadProgress(
progress = progress,
total = total
)
)
)
}
}
}
updateState {
copy(
Expand Down Expand Up @@ -266,6 +299,19 @@ class GithubViewModel(
return@dispatchUpdate
}

// If automated background search, download the update APK silently in advance
if (!fromUser) {
val activity = com.lagradost.cloudstream3.CommonActivity.activity
if (activity != null) {
ApkUpdater.downloadSilently(
activity,
release.downloadUrl,
release.tagName,
DigestPair.parse(release.digest)
)
}
}

updateState {
copy(
dialog = baseDialog.copy(
Expand Down Expand Up @@ -296,4 +342,14 @@ class GithubViewModel(
userName = remoteUserName,
repository = remoteRepository,
)

private fun deleteCachedApk(tagName: String) {
val activity = com.lagradost.cloudstream3.CommonActivity.activity
if (activity != null) {
val file = ApkUpdater.getCachedUpdateFile(activity, tagName)
if (file.exists()) {
file.delete()
}
}
}
}
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@
<string name="update_notification_downloading">Downloading app update…</string>
<string name="update_notification_installing">Installing app update…</string>
<string name="update_notification_failed">Could not install the new version of the app</string>
<string name="install_update">Installing update…</string>
<string name="apk_installer_legacy">Legacy</string>
<string name="apk_installer_package_installer">PackageInstaller</string>
<string name="delayed_update_notice">App will be updated upon exit</string>
Expand Down