From e856bcbbfe2e7af3982bff46b3ae5fffa2870715 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Thu, 5 Nov 2020 11:07:13 -0500 Subject: [PATCH] Some Kotlin cleanup --- .../core/downloader/VancedDownloader.kt | 4 +- .../ui/viewmodels/SettingsViewModel.kt | 6 +-- .../com/vanced/manager/utils/JsonHelper.kt | 2 +- .../com/vanced/manager/utils/PackageHelper.kt | 50 ++++++++----------- 4 files changed, 25 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt index 7e78695c..3385b5b9 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt @@ -121,7 +121,7 @@ object VancedDownloader { "lang" -> { count++ succesfulLangCount++ - if (count < lang?.count()!!) + if (count < lang?.size!!) downloadSplits(context, "lang") else startVancedInstall(context) @@ -133,7 +133,7 @@ object VancedDownloader { if (type == "lang") { count++ when { - count < lang?.count()!! -> downloadSplits(context, "lang") + count < lang?.size!! -> downloadSplits(context, "lang") succesfulLangCount == 0 -> { lang?.add("en") downloadSplits(context, "lang") diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/SettingsViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/SettingsViewModel.kt index ef538802..f8cbecab 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodels/SettingsViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/SettingsViewModel.kt @@ -3,8 +3,4 @@ package com.vanced.manager.ui.viewmodels import androidx.fragment.app.FragmentActivity import androidx.lifecycle.ViewModel -class SettingsViewModel(activity: FragmentActivity) : ViewModel() { - - - -} \ No newline at end of file +class SettingsViewModel(activity: FragmentActivity) : ViewModel() \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/utils/JsonHelper.kt b/app/src/main/java/com/vanced/manager/utils/JsonHelper.kt index 12a91922..f2d23911 100644 --- a/app/src/main/java/com/vanced/manager/utils/JsonHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/JsonHelper.kt @@ -9,7 +9,7 @@ import com.github.kittinunf.fuel.httpGet object JsonHelper { - var dataMap: HashMap = HashMap() + private var dataMap: HashMap = HashMap() suspend fun getJson(url: String): JsonObject? { return try { diff --git a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt index a39e67f5..ce4727e7 100644 --- a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt @@ -29,7 +29,7 @@ import kotlin.collections.ArrayList import kotlin.collections.HashMap object PackageHelper { - + private const val apkInstallPath = "/data/adb/Vanced/" fun isPackageInstalled(packageName: String, packageManager: PackageManager): Boolean { return try { @@ -116,7 +116,7 @@ object PackageHelper { e.printStackTrace() } } - + fun install(path: String, context: Context) { val callbackIntent = Intent(context, AppInstallerService::class.java) val pendingIntent = PendingIntent.getService(context, 0, callbackIntent, 0) @@ -136,7 +136,7 @@ object PackageHelper { outputStream.close() session.commit(pendingIntent.intentSender) } - + fun installVanced(context: Context): Int { val apkFolderPath = context.getExternalFilesDir("vanced/nonroot")?.path.toString() + "/" val nameSizeMap = HashMap() @@ -238,7 +238,7 @@ object PackageHelper { session!!.close() } } - + fun installVancedRoot(context: Context) { CoroutineScope(Dispatchers.IO).launch { Shell.enableVerboseLogging = BuildConfig.DEBUG @@ -254,11 +254,8 @@ object PackageHelper { val apkFilesPath = context.getExternalFilesDir("vanced/root")?.path val fileInfoList = apkFilesPath?.let { it1 -> getFileInfoList(it1) } if (fileInfoList != null) { - var modApk: FileInfo? = null - for (file in fileInfoList) { - if (file.name == "dark.apk" || file.name == "black.apk") { - modApk = file - } + val modApk: FileInfo? = fileInfoList.lastOrNull { + it.name == "dark.apk" || it.name == "black.apk" } if (modApk != null) { if (overwriteBase(modApk, fileInfoList, vancedVersionCode!!, context)) { @@ -281,7 +278,7 @@ object PackageHelper { } } - + private fun installSplitApkFiles(apkFiles: ArrayList, context: Context) : Boolean { var sessionId: Int? Log.d("AppLog", "installing split apk files:$apkFiles") @@ -315,8 +312,8 @@ object PackageHelper { val installResult = Shell.su("pm install-commit $sessionId").exec() if (installResult.isSuccess) { return true - } else - sendFailure(installResult.out, context) + } + sendFailure(installResult.out, context) return false } @@ -333,8 +330,9 @@ object PackageHelper { if (parentFile.exists() && parentFile.canRead()) { val listFiles = parentFile.listFiles() ?: return ArrayList() - for (file in listFiles) - result.add(FileInfo(file.name, file.length(), file)) + listFiles.mapTo(result) { + FileInfo(it.name, it.length(), it) + } return result } val longLines = Shell.su("ls -l $splitApkPath").exec().out @@ -425,9 +423,7 @@ object PackageHelper { } return true } - else { - return fixNoInstall(baseApkFiles, context) - } + return fixNoInstall(baseApkFiles, context) } return fixNoInstall(baseApkFiles, context) } @@ -508,10 +504,8 @@ object PackageHelper { return false } } - else { - sendFailure(listOf("IFile_Missing").toMutableList(), context) - return false - } + sendFailure(listOf("IFile_Missing").toMutableList(), context) + return false } @@ -534,14 +528,12 @@ object PackageHelper { if(execRes.isSuccess) { val result = execRes.out var version = 0 - for(line in result) { - val versionCode = line.substringAfter("=") - val versionCodeFiltered = versionCode.substringBefore(" ") - if(version < Integer.valueOf(versionCodeFiltered)) - { - version = Integer.valueOf(versionCodeFiltered) - } - } + result + .asSequence() + .map { it.substringAfter("=") } + .map { it.substringBefore(" ") } + .filter { version < Integer.valueOf(it) } + .forEach { version = Integer.valueOf(it) } return version } }