Update the updater to compose

app/src/main/AndroidManifest.xml

@@ -253,6 +253,10 @@
             </intent-filter>
         </receiver>
 
+        <receiver
+            android:name=".receivers.PackageInstallerStatusReceiver"
+            android:exported="false" />
+
         <service
             android:name=".services.VideoDownloadService"
             android:enabled="true"

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -179,6 +179,7 @@ import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
 import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream4.theme.CloudStreamTheme
 import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
@@ -1297,6 +1298,14 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 padRight = false,
                 padTop = false
             )
+
+            composeView.apply {
+                setContent {
+                    CloudStreamTheme {
+                        MainActivityScreen.Content()
+                    }
+                }
+            }
         }
 
         // overscan
@@ -1980,7 +1989,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         handleAppIntent(intent)
 
         ioSafe {
-            runAutoUpdate()
+            runAutoUpdate() // TODO remove this when we update the updater autosearch
         }
 
         FcastManager().init(this, false)

app/src/main/java/com/lagradost/cloudstream3/MainActivityScreen.kt

@@ -0,0 +1,250 @@
+package com.lagradost.cloudstream3
+
+import android.text.format.Formatter.formatFileSize
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.LocalActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.lagradost.cloudstream3.mvvm.getStackTracePretty
+import com.lagradost.cloudstream3.ui.settings.APK_CONTENT_TYPE
+import com.lagradost.cloudstream3.ui.settings.APK_PRERELEASE
+import com.lagradost.cloudstream3.ui.settings.APK_REPOSITORY
+import com.lagradost.cloudstream3.ui.settings.APK_USERNAME
+import com.lagradost.cloudstream3.ui.settings.ApkUpdater
+import com.lagradost.cloudstream3.ui.settings.GithubAction
+import com.lagradost.cloudstream3.ui.settings.GithubAction.AutoSearchForUpdate
+import com.lagradost.cloudstream3.ui.settings.GithubAction.Dismiss
+import com.lagradost.cloudstream3.ui.settings.GithubAction.SearchForUpdate
+import com.lagradost.cloudstream3.ui.settings.GithubAction.SkipUpdate
+import com.lagradost.cloudstream3.ui.settings.GithubAction.Update
+import com.lagradost.cloudstream3.ui.settings.GithubState
+import com.lagradost.cloudstream3.ui.settings.GithubUpdateDialogState
+import com.lagradost.cloudstream3.ui.settings.GithubViewModel
+import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
+import com.lagradost.cloudstream4.compose.BlackButton
+import com.lagradost.cloudstream4.compose.Screen
+import com.lagradost.cloudstream4.compose.WhiteButton
+import com.lagradost.cloudstream4.rememberAppSettings
+import com.mihon.material.padding
+
+object MainActivityScreen : Screen {
+    @Composable
+    fun githubViewModel(): GithubViewModel? {
+        // By having the ComponentActivity as the owner we can have a singleton viewmodel
+        val activity = LocalActivity.current as? ComponentActivity ?: return null
+        val settings = rememberAppSettings()
+        return viewModel(viewModelStoreOwner = activity) {
+            GithubViewModel(
+                remoteUserName = APK_USERNAME,
+                remoteRepository = APK_REPOSITORY,
+                remotePrereleaseTag = APK_PRERELEASE,
+                remoteContentType = APK_CONTENT_TYPE,
+                versionName = BuildConfig.VERSION_NAME,
+                isPrerelease = BuildConfig.FLAVOR == "prerelease",
+                isDebug = BuildConfig.DEBUG,
+                buildSha = activity.currentCommitHash(),
+                settings = settings,
+                updater = ApkUpdater
+            )/*.apply {
+                onAction(AutoSearchForUpdate) // Remove this for now
+            }*/
+        }
+    }
+
+    @Composable
+    override fun Content() {
+        GithubView()
+    }
+
+    @Composable
+    fun GithubView() {
+        val updateViewModel = githubViewModel() ?: return
+        val state by updateViewModel.state.collectAsState()
+        GithubState(state, updateViewModel::onAction)
+    }
+
+    @Composable
+    fun GithubState(updaterState: GithubState, onAction: (GithubAction) -> Unit) {
+        if (updaterState.dialog == null) {
+            return
+        }
+
+        val title: String
+        val body: @Composable () -> Unit
+        val confirmButton: @Composable () -> Unit
+        val dismissButton: @Composable () -> Unit
+        val cancelable: Boolean
+
+        when (val state = updaterState.dialog.state) {
+            is GithubUpdateDialogState.Error -> {
+                // Only show error if it is initialized by the user
+                if (!updaterState.dialog.isFromUser) return
+
+                cancelable = true
+                title = stringResource(R.string.download_failed)
+                body = { Text(text = state.error.getStackTracePretty()) }
+                confirmButton = {
+                    WhiteButton(text = stringResource(R.string.check_for_update), onClick = {
+                        onAction(SearchForUpdate)
+                    })
+                }
+                dismissButton = {
+                    BlackButton(text = stringResource(R.string.ok), onClick = {
+                        onAction(Dismiss)
+                    })
+                }
+            }
+
+            GithubUpdateDialogState.Loading -> {
+                // Only show loading if it is initialized by the user
+                if (!updaterState.dialog.isFromUser) return
+
+                cancelable = true
+                title = stringResource(R.string.loading)
+                body = {
+                    LinearProgressIndicator(
+                        modifier = Modifier.fillMaxWidth(),
+                        color = MaterialTheme.colorScheme.onBackground,
+                        trackColor = MaterialTheme.colorScheme.surfaceVariant,
+                    )
+                }
+                confirmButton = {}
+                dismissButton = {
+                    BlackButton(text = stringResource(R.string.cancel), onClick = {
+                        onAction(Dismiss)
+                    })
+                }
+            }
+
+            GithubUpdateDialogState.NoUpdateFound -> {
+                // Only show error if it is initialized by the user
+                if (!updaterState.dialog.isFromUser) return
+
+                cancelable = true
+                title = stringResource(R.string.no_update_found)
+                body = {}
+                confirmButton = {
+                    WhiteButton(text = stringResource(R.string.ok), onClick = {
+                        onAction(Dismiss)
+                    })
+                }
+                dismissButton = {}
+            }
+
+            is GithubUpdateDialogState.UpdateFound -> {
+                cancelable = true
+                title = stringResource(
+                    R.string.new_update_format,
+                    (state.oldSha ?: BuildConfig.VERSION_NAME),
+                    (state.newSha ?: state.file.displayName)
+                )
+                body = { Text(text = state.file.changeLog) }
+                confirmButton = {
+                    WhiteButton(text = stringResource(R.string.update), onClick = {
+                        onAction(Update(state.file))
+                    })
+                }
+                dismissButton = {
+                    BlackButton(text = stringResource(R.string.skip_update), onClick = {
+                        onAction(SkipUpdate(state.file))
+                        onAction(Dismiss)
+                    })
+                    BlackButton(text = stringResource(R.string.cancel), onClick = {
+                        onAction(Dismiss)
+                    })
+                }
+            }
+
+            is GithubUpdateDialogState.DownloadProgress -> {
+                cancelable = false
+                title = stringResource(R.string.update_notification_downloading)
+                body = {
+                    if (state.total != null) {
+                        val progress =
+                            (state.progress.toFloat() / state.total.toFloat()).coerceIn(0.0f, 1.0f)
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                            Text(
+                                color = MaterialTheme.colorScheme.onBackground,
+                                style = MaterialTheme.typography.bodyMedium,
+                                textAlign = TextAlign.Center,
+                                // Round down the progress to avoid 100%
+                                text = "${(progress * 100.0f).toInt()}% (${
+                                    formatFileSize(
+                                        LocalContext.current,
+                                        state.progress
+                                    )
+                                } / ${
+                                    formatFileSize(
+                                        LocalContext.current,
+                                        state.total
+                                    )
+                                })"
+                            )
+                            Spacer(modifier = Modifier.height(MaterialTheme.padding.medium))
+                            LinearProgressIndicator(
+                                modifier = Modifier.fillMaxWidth(),
+                                color = MaterialTheme.colorScheme.onBackground,
+                                trackColor = MaterialTheme.colorScheme.surfaceVariant,
+                                progress = { progress }
+                            )
+                        }
+                    } else {
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                            Text(
+                                color = MaterialTheme.colorScheme.onBackground,
+                                style = MaterialTheme.typography.bodyMedium,
+                                textAlign = TextAlign.Center,
+                                text = formatFileSize(
+                                    LocalContext.current,
+                                    state.progress
+                                )
+                            )
+                            Spacer(modifier = Modifier.height(MaterialTheme.padding.medium))
+                            LinearProgressIndicator(
+                                modifier = Modifier.fillMaxWidth(),
+                                color = MaterialTheme.colorScheme.onBackground,
+                                trackColor = MaterialTheme.colorScheme.surfaceVariant,
+                            )
+                        }
+                    }
+                }
+                confirmButton = {}
+                dismissButton = {
+                    BlackButton(text = stringResource(R.string.cancel), onClick = {
+                        onAction(Dismiss)
+                    })
+                }
+            }
+        }
+
+        AlertDialog(
+            properties = DialogProperties(usePlatformDefaultWidth = false),
+            containerColor = MaterialTheme.colorScheme.background,
+            onDismissRequest = {
+                if (cancelable) {
+                    onAction(Dismiss)
+                }
+            },
+            title = { Text(text = title) },
+            text = body,
+            confirmButton = confirmButton,
+            dismissButton = dismissButton
+        )
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/receivers/PackageInstallerStatusReceiver.kt

@@ -0,0 +1,28 @@
+package com.lagradost.cloudstream3.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import com.lagradost.cloudstream3.utils.getSafeParcelableExtra
+
+/** https://medium.com/@solrudev/painless-building-of-an-android-package-installer-app-d5a09b5df432 */
+class PackageInstallerStatusReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -1)) {
+            PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                intent.getSafeParcelableExtra<Intent>(Intent.EXTRA_INTENT)?.let { userAction->
+                    userAction.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(userAction)
+                }
+            }
+            PackageInstaller.STATUS_SUCCESS -> {
+                // do something on success
+            }
+            else -> {
+                val message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
+                println("PackageInstallerStatusReceiver: status=$status, message=$message")
+            }
+        }
+    }
+}