Sry but Android Studio choose to push my commit over yours

This commit is contained in:
LooKeR 2021-11-24 09:02:00 +05:30
parent 750718c11c
commit 5081e1f017

View File

@ -1,8 +1,9 @@
package com.looker.droidify.installer package com.looker.droidify.installer
import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.content.pm.PackageInstaller.SessionParams
import com.looker.droidify.content.Cache import com.looker.droidify.content.Cache
import com.looker.droidify.utility.extension.android.Android import com.looker.droidify.utility.extension.android.Android
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -25,38 +26,48 @@ class DefaultInstaller(context: Context) : BaseInstaller(context) {
override suspend fun uninstall(packageName: String) = mDefaultUninstaller(packageName) override suspend fun uninstall(packageName: String) = mDefaultUninstaller(packageName)
private suspend fun mDefaultInstaller(cacheFile: File) { private fun mDefaultInstaller(cacheFile: File) {
val (uri, flags) = if (Android.sdk(24)) { val sessionInstaller = context.packageManager.packageInstaller
Pair( val sessionParams =
Cache.getReleaseUri(context, cacheFile.name), SessionParams(SessionParams.MODE_FULL_INSTALL)
Intent.FLAG_GRANT_READ_URI_PERMISSION
) if (Android.sdk(31)) {
} else { sessionParams.setRequireUserAction(SessionParams.USER_ACTION_NOT_REQUIRED)
Pair(Uri.fromFile(cacheFile), 0)
} }
// TODO Handle deprecation
@Suppress("DEPRECATION") val id = sessionInstaller.createSession(sessionParams)
withContext(Dispatchers.Default) {
context.startActivity( val session = sessionInstaller.openSession(id)
Intent(Intent.ACTION_INSTALL_PACKAGE)
.setDataAndType(uri, "application/vnd.android.package-archive") session.use { activeSession ->
.setFlags(flags) activeSession.openWrite("package", 0, cacheFile.length()).use { packageStream ->
) cacheFile.inputStream().use { fileStream ->
fileStream.copyTo(packageStream)
}
}
val intent = Intent(context, InstallerService::class.java)
val flags = if (Android.sdk(31)) PendingIntent.FLAG_MUTABLE else 0
val pendingIntent = PendingIntent.getService(context, id, intent, flags)
session.commit(pendingIntent.intentSender)
} }
} }
private suspend fun mDefaultUninstaller(packageName: String) { private suspend fun mDefaultUninstaller(packageName: String) {
val uri = Uri.fromParts("package", packageName, null) val sessionInstaller = context.packageManager.packageInstaller
val intent = Intent()
intent.data = uri val intent = Intent(context, InstallerService::class.java)
@Suppress("DEPRECATION") intent.putExtra(InstallerService.KEY_ACTION, InstallerService.ACTION_UNINSTALL)
if (Android.sdk(28)) {
intent.action = Intent.ACTION_DELETE val flags = if (Android.sdk(31)) PendingIntent.FLAG_MUTABLE else 0
} else {
intent.action = Intent.ACTION_UNINSTALL_PACKAGE val pendingIntent = PendingIntent.getService(context, -1, intent, flags)
intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
withContext(Dispatchers.IO) {
sessionInstaller.uninstall(packageName, pendingIntent.intentSender)
} }
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
withContext(Dispatchers.Default) { context.startActivity(intent) }
} }
} }