avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 19:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Freeze with Root Installer

Browse Source
This commit is contained in:
LooKeR 2021-11-18 11:59:04 +05:30
parent 6c481138e0
commit c2360f492a
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/kotlin/com/looker/droidify/installer/DefaultInstaller.kt
View File

@ -6,7 +6,6 @@ import android.net.Uri
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
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.io.File import java.io.File
@ -38,13 +37,11 @@ class DefaultInstaller(context: Context) : BaseInstaller(context) {
// TODO Handle deprecation // TODO Handle deprecation
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
launch { context.startActivity(
context.startActivity( Intent(Intent.ACTION_INSTALL_PACKAGE)
Intent(Intent.ACTION_INSTALL_PACKAGE) .setDataAndType(uri, "application/vnd.android.package-archive")
.setDataAndType(uri, "application/vnd.android.package-archive") .setFlags(flags)
.setFlags(flags) )
)
}
} }
} }
@ -60,6 +57,6 @@ class DefaultInstaller(context: Context) : BaseInstaller(context) {
intent.putExtra(Intent.EXTRA_RETURN_RESULT, true) intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
} }
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
withContext(Dispatchers.IO) { launch { context.startActivity(intent) } } withContext(Dispatchers.IO) { context.startActivity(intent) }
} }
} }

10
src/main/kotlin/com/looker/droidify/installer/RootInstaller.kt
View File

@ -5,7 +5,6 @@ import android.util.Log
import com.looker.droidify.content.Cache import com.looker.droidify.content.Cache
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.io.File import java.io.File
@ -25,7 +24,6 @@ class RootInstaller(context: Context) : BaseInstaller(context) {
override suspend fun uninstall(packageName: String) = mRootUninstaller(packageName) override suspend fun uninstall(packageName: String) = mRootUninstaller(packageName)
private suspend fun mRootInstaller(cacheFile: File) { private suspend fun mRootInstaller(cacheFile: File) {
Log.e("UserID", getCurrentUserState)
val installCommand = val installCommand =
String.format( String.format(
ROOT_INSTALL_PACKAGE, ROOT_INSTALL_PACKAGE,
@ -40,18 +38,14 @@ class RootInstaller(context: Context) : BaseInstaller(context) {
cacheFile.absolutePath.quote cacheFile.absolutePath.quote
) )
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
launch { Shell.su(installCommand).submit { if (it.isSuccess) Shell.su(deleteCommand).submit() }
Shell.su(installCommand).submit {
if (it.isSuccess) Shell.su(deleteCommand).submit()
}
}
} }
} }
private suspend fun mRootUninstaller(packageName: String) { private suspend fun mRootUninstaller(packageName: String) {
val uninstallCommand = val uninstallCommand =
String.format(ROOT_UNINSTALL_PACKAGE, getCurrentUserState, packageName) String.format(ROOT_UNINSTALL_PACKAGE, getCurrentUserState, packageName)
withContext(Dispatchers.IO) { launch { Shell.su(uninstallCommand).submit() } } withContext(Dispatchers.IO) { Shell.su(uninstallCommand).submit() }
} }
private val getCurrentUserState: String = private val getCurrentUserState: String =

11
src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
View File

@ -19,6 +19,7 @@ import com.looker.droidify.R
import com.looker.droidify.content.ProductPreferences import com.looker.droidify.content.ProductPreferences
import com.looker.droidify.database.Database import com.looker.droidify.database.Database
import com.looker.droidify.entity.* import com.looker.droidify.entity.*
import com.looker.droidify.installer.AppInstaller
import com.looker.droidify.service.Connection import com.looker.droidify.service.Connection
import com.looker.droidify.service.DownloadService import com.looker.droidify.service.DownloadService
import com.looker.droidify.utility.RxUtils import com.looker.droidify.utility.RxUtils
@ -50,7 +51,7 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks {
private enum class Action( private enum class Action(
val id: Int, val id: Int,
val adapterAction: ProductAdapter.Action val adapterAction: ProductAdapter.Action,
) { ) {
INSTALL(1, ProductAdapter.Action.INSTALL), INSTALL(1, ProductAdapter.Action.INSTALL),
UPDATE(2, ProductAdapter.Action.UPDATE), UPDATE(2, ProductAdapter.Action.UPDATE),
@ -356,9 +357,9 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks {
} }
(recyclerView?.adapter as? ProductAdapter)?.setStatus(status) (recyclerView?.adapter as? ProductAdapter)?.setStatus(status)
if (state is DownloadService.State.Success && isResumed) { if (state is DownloadService.State.Success && isResumed) {
lifecycleScope.launch(Dispatchers.Default) { lifecycleScope.launch(Dispatchers.IO) {
state.consume() state.consume()
screenActivity.defaultInstaller?.install(state.release.cacheFileName) AppInstaller.getInstance(context)?.defaultInstaller?.install(state.release.cacheFileName)
} }
} }
} }
@ -405,8 +406,8 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks {
) )
} }
ProductAdapter.Action.UNINSTALL -> { ProductAdapter.Action.UNINSTALL -> {
lifecycleScope.launch(Dispatchers.Default) { lifecycleScope.launch(Dispatchers.IO) {
screenActivity.defaultInstaller?.uninstall(packageName) AppInstaller.getInstance(context)?.defaultInstaller?.uninstall(packageName)
} }
Unit Unit
} }

8
src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
View File

@ -69,8 +69,6 @@ abstract class ScreenActivity : AppCompatActivity() {
return supportFragmentManager.findFragmentById(R.id.main_content) return supportFragmentManager.findFragmentById(R.id.main_content)
} }
val defaultInstaller = AppInstaller.getInstance(this)?.defaultInstaller
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration)) setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -220,9 +218,11 @@ abstract class ScreenActivity : AppCompatActivity() {
is SpecialIntent.Install -> { is SpecialIntent.Install -> {
val packageName = specialIntent.packageName val packageName = specialIntent.packageName
if (!packageName.isNullOrEmpty()) { if (!packageName.isNullOrEmpty()) {
lifecycleScope.launch(Dispatchers.Default) { lifecycleScope.launch(Dispatchers.IO) {
specialIntent.cacheFileName?.let { specialIntent.cacheFileName?.let {
defaultInstaller?.install(packageName, it) AppInstaller.getInstance(this@ScreenActivity)?.defaultInstaller?.install(
packageName,
it)
} }
} }
} }