fix: Showing progress if downloading an APK + minor fixes

Author: brosssh

README.md

@@ -72,15 +72,15 @@ The collection of ReVanced downloaders.
 - The downloader will now be usable.
 
 
-### APMMirror Downloader
+### APKMirror Downloader
 This downloader will open an [APKMirror](https://www.apkmirror.com/) page where you can download the apk as you would normally do.
 If the chosen file is a bundle (.apkm file), the downloader will automatically merge it into a .apk file.
 
 ### Play Store Downloader
 When you get prompted, log in to Google with your account. After that, you will be able to download apps from the Play Store.
 
 > [!WARNING]
-> Due to technical limitations, it is only possible to download the latest version of the app. If the ReVanced suggested version differs from the latest, the installation will fail.
+> Due to technical limitations, it is only possible to download the latest version of the app. If the suggested version differs from the latest, the installation will fail.
 
 ## 📚 Everything else
 

downloaders/apkmirror-downloader/src/main/kotlin/app/revanced/manager/plugin/downloader/apkmirror/APKMirrorDownloader.kt

@@ -15,15 +15,15 @@ import kotlinx.parcelize.Parcelize
 import java.io.File
 import java.net.URI
 import java.nio.file.Files
+import java.util.UUID
 import java.util.zip.ZipFile
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.deleteRecursively
 import kotlin.io.path.outputStream
 
 @Parcelize
 class ApkMirrorApp(
-    val downloadUrl: DownloadUrl,
-    val packageName: String
+    val downloadUrl: DownloadUrl
 ) : Parcelable
 
 private object ArscLogger : APKLogger {
@@ -56,37 +56,33 @@ val ApkMirrorDownloader = Downloader<ApkMirrorApp> {
                     )
                 }
 
-                with(Uri.Builder()) {
-                    scheme("https")
-                    authority("www.apkmirror.com")
-                    mapOf(
-                        "post_type" to "app_release",
-                        "searchtype" to "apk",
-                        "s" to (version?.let { "$packageName $it" } ?: packageName),
-                        "bundles%5B%5D" to "apk_files" // bundles[]
-                    ).forEach { (key, value) ->
-                        appendQueryParameter(key, value)
-                    }
-
-                    build().toString()
-                }
-            },
-            packageName = packageName
+                Uri.Builder()
+                    .scheme("https")
+                    .authority("www.apkmirror.com")
+                    .appendQueryParameter("post_type", "app_release")
+                    .appendQueryParameter("searchtype", "apk")
+                    .appendQueryParameter("s", version?.let { "$packageName $it" } ?: packageName)
+                    .appendQueryParameter("bundles%5B%5D" /* bundles[] */, "apk_files")
+                    .toString()
+            }
         ) to version
     }
 
     download { app, outputStream ->
         val workingDir = Files.createTempDirectory("apkmirror_dl")
-        val downloadedFile = workingDir.resolve("${app.packageName}.apk").also {
-            it.outputStream().use { output ->
-                app.downloadUrl.toDownloadResult().first.copyTo(output)
-            }
-        }
-
         try {
             if (URI(app.downloadUrl.url).path.substringAfterLast('/').endsWith(".apk")) {
-                Files.copy(downloadedFile, outputStream)
+                val (inputStream, size) = app.downloadUrl.toDownloadResult()
+                inputStream.use {
+                    if (size != null) reportSize(size)
+                    it.copyTo(outputStream)
+                }
             } else {
+                val downloadedFile = workingDir.resolve(UUID.randomUUID().toString()).also {
+                    it.outputStream().use { output ->
+                        app.downloadUrl.toDownloadResult().first.copyTo(output)
+                    }
+                }
                 val xapkWorkingDir = workingDir.resolve("xapk").also { it.toFile().mkdirs() }
 
                 ZipFile(downloadedFile.toString()).use { zip ->