Batyka/zaprett-app
1
0
Fork 0
mirror of https://github.com/CherretGit/zaprett-app.git synced 2026-01-08 20:09:41 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

add updater error handling

Browse Source
This commit is contained in:
white
2025-08-31 17:58:10 +03:00
parent 0386fbbccd
commit c4da9d1c29
4 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/cherret/zaprett/ui/viewmodel/BaseRepoViewModel.kt
View File

@@ -16,7 +16,7 @@ import com.cherret.zaprett.utils.download
import com.cherret.zaprett.utils.getFileSha256
import com.cherret.zaprett.utils.getHostListMode
import com.cherret.zaprett.utils.getZaprettPath
import com.cherret.zaprett.utils.registerDownloadListenerHost
import com.cherret.zaprett.utils.registerDownloadListener
import com.cherret.zaprett.utils.restartService
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
@@ -93,7 +93,7 @@ abstract class BaseRepoViewModel(application: Application) : AndroidViewModel(ap
fun install(item: RepoItemInfo) {
isInstalling[item.name] = true
val downloadId = download(context, item.url)
registerDownloadListenerHost(context, downloadId, { uri ->
registerDownloadListener(context, downloadId, { uri ->
viewModelScope.launch(Dispatchers.IO) {
val sourceFile = File(uri.path!!)
val targetDir = when (item.type) {
@@ -120,7 +120,7 @@ abstract class BaseRepoViewModel(application: Application) : AndroidViewModel(ap
fun update(item: RepoItemInfo) {
isUpdateInstalling[item.name] = true
val downloadId = download(context, item.url)
registerDownloadListenerHost(
registerDownloadListener(
context,
downloadId,
onDownloaded = { uri ->

7
app/src/main/java/com/cherret/zaprett/ui/viewmodel/HomeViewModel.kt
View File

@@ -226,9 +226,12 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
showUpdateDialog.value = false
if (context.packageManager.canRequestPackageInstalls()){
val id = download(context, downloadUrl.value.orEmpty())
registerDownloadListener(context, id) { uri ->
registerDownloadListener(context, id, { uri ->
installApk(context, uri)
}
},
onError = {
})
}
else {
val packageUri = Uri.fromParts("package", context.packageName, null)

2
app/src/main/java/com/cherret/zaprett/utils/RepositoryDownloader.kt
View File

@@ -69,7 +69,7 @@ fun getRepo(url: String, callback: (Result<List<RepoItemInfo>>) -> Unit) {
})
}
fun registerDownloadListenerHost(context: Context, downloadId: Long, onDownloaded: (Uri) -> Unit, onError: (String) -> Unit) {// AI Generated
fun registerDownloadListener(context: Context, downloadId: Long, onDownloaded: (Uri) -> Unit, onError: (String) -> Unit) {// AI Generated
val receiver = object : BroadcastReceiver() {
@SuppressLint("Range")
override fun onReceive(context: Context?, intent: Intent?) {

24
app/src/main/java/com/cherret/zaprett/utils/Updater.kt
View File

@@ -95,30 +95,6 @@ fun installApk(context: Context, uri: Uri) {
context.startActivity(intent)
}
}
fun registerDownloadListener(context: Context, downloadId: Long, onDownloaded: (Uri) -> Unit) {// AI Generated
val receiver = object : BroadcastReceiver() {
@SuppressLint("Range")
override fun onReceive(context: Context?, intent: Intent?) {
if (intent?.action != DownloadManager.ACTION_DOWNLOAD_COMPLETE) return
if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadId) return
val downloadManager = context?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager ?: return
downloadManager.query(DownloadManager.Query().setFilterById(downloadId)).use { cursor ->
if (cursor.moveToFirst() && cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)) == DownloadManager.STATUS_SUCCESSFUL) {
context.unregisterReceiver(this)
onDownloaded(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).toUri())
}
}
}
}
val intentFilter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
context.registerReceiver(receiver, intentFilter, Context.RECEIVER_EXPORTED)
} else {
ContextCompat.registerReceiver(context, receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), ContextCompat.RECEIVER_EXPORTED)
}
}
@Serializable
data class UpdateInfo(
val version: String?,