fixed a visual bug in manager update dialog

TeamVanced · Nov 13, 2020 · eaec53c · eaec53c
1 parent 32efb91
commit eaec53c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 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
@@ -15,27 +15,18 @@ import com.vanced.manager.utils.DeviceUtils.getArch
 import com.vanced.manager.utils.DownloadHelper.downloadProgress
 import com.vanced.manager.utils.Extensions.getInstallUrl
 import com.vanced.manager.utils.Extensions.getLatestAppVersion
-import com.vanced.manager.utils.InternetTools
 import com.vanced.manager.utils.InternetTools.backupUrl
-import com.vanced.manager.utils.InternetTools.baseUrl
-import com.vanced.manager.utils.InternetTools.checkSHA256
 import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
-import com.vanced.manager.utils.InternetTools.getSha256
 import com.vanced.manager.utils.InternetTools.vanced
 import com.vanced.manager.utils.InternetTools.vancedVersions
 import com.vanced.manager.utils.LanguageHelper.getDefaultVancedLanguages
 import com.vanced.manager.utils.PackageHelper.downloadStockCheck
-import com.vanced.manager.utils.PackageHelper.getPkgVerCode
 import com.vanced.manager.utils.PackageHelper.installVanced
 import com.vanced.manager.utils.PackageHelper.installVancedRoot
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import java.io.File
-import java.io.IOException
-import java.security.MessageDigest
-import java.util.*
 
 object VancedDownloader {
 

diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerUpdateDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerUpdateDialog.kt
@@ -21,7 +21,7 @@ import com.vanced.manager.utils.DownloadHelper.downloadProgress
 import com.vanced.manager.utils.InternetTools.isUpdateAvailable
 
 class ManagerUpdateDialog(
-        private val forceUpdate: Boolean
+    private val forceUpdate: Boolean
 ) : DialogFragment() {
 
     private lateinit var binding: DialogManagerUpdateBinding

diff --git a/app/src/main/java/com/vanced/manager/utils/AppUtils.kt b/app/src/main/java/com/vanced/manager/utils/AppUtils.kt
@@ -6,7 +6,6 @@ import android.content.pm.PackageInstaller
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.vanced.manager.BuildConfig.APPLICATION_ID
 import com.vanced.manager.R
-import com.vanced.manager.core.downloader.VancedDownloader
 import com.vanced.manager.ui.dialogs.AppDownloadDialog
 import com.vanced.manager.ui.fragments.HomeFragment
 import com.vanced.manager.utils.DownloadHelper.downloadProgress

diff --git a/app/src/main/java/com/vanced/manager/utils/DownloadHelper.kt b/app/src/main/java/com/vanced/manager/utils/DownloadHelper.kt
@@ -44,16 +44,19 @@ object DownloadHelper {
     fun downloadManager(context: Context) {
         CoroutineScope(Dispatchers.IO).launch {
             val url = "https://github.com/YTVanced/VancedManager/releases/latest/download/manager.apk"
-            downloadProgress.get()?.currentDownload = PRDownloader.download(url, context.getExternalFilesDir("apk")?.path, "manager.apk")
+            downloadProgress.get()?.currentDownload = PRDownloader.download(url, context.getExternalFilesDir("manager")?.path, "manager.apk")
                 .build()
                 .setOnProgressListener { progress ->
                     val mProgress = progress.currentBytes * 100 / progress.totalBytes
                     downloadProgress.get()?.downloadProgress?.set(mProgress.toInt())
                 }
+                .setOnCancelListener {
+                    downloadProgress.get()?.downloadProgress?.set(0)
+                }
                 .start(object : OnDownloadListener {
                     override fun onDownloadComplete() {
                         val apk =
-                            File("${context.getExternalFilesDir("apk")?.path}/manager.apk")
+                            File("${context.getExternalFilesDir("manager")?.path}/manager.apk")
                         val uri =
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                                 FileProvider.getUriForFile(

diff --git a/app/src/main/java/com/vanced/manager/utils/Extensions.kt b/app/src/main/java/com/vanced/manager/utils/Extensions.kt
@@ -10,7 +10,6 @@ import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.vanced.manager.R
-import com.vanced.manager.model.AppVersionsModel
 import com.vanced.manager.utils.InternetTools.baseUrl
 import com.vanced.manager.utils.InternetTools.loadJson
 import java.util.*

diff --git a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
@@ -12,7 +12,6 @@ import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
 import com.vanced.manager.BuildConfig
 import com.vanced.manager.R
-import com.vanced.manager.core.downloader.VancedDownloader
 import com.vanced.manager.utils.AppUtils.generateChecksum
 import com.vanced.manager.utils.Extensions.getDefaultPrefs
 import kotlinx.coroutines.CoroutineScope