GitLab Links

* Add new OkHttpClient for Aurora. * Try to find apk in GitLab links. * Fixes #506
rumboalla · Feb 8, 2024 · 37b5de1 · 37b5de1
1 parent 164126b
commit 37b5de1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/app/src/main/kotlin/com/apkupdater/data/gitlab/GitLabAssets.kt b/app/src/main/kotlin/com/apkupdater/data/gitlab/GitLabAssets.kt
@@ -1,4 +1,7 @@
 package com.apkupdater.data.gitlab
 
 
-data class GitLabAssets(val sources: List<GitLabAsset>)
+data class GitLabAssets(
+    val sources: List<GitLabAsset>,
+    val links: List<GitLabLink>
+)
diff --git a/app/src/main/kotlin/com/apkupdater/data/gitlab/GitLabLink.kt b/app/src/main/kotlin/com/apkupdater/data/gitlab/GitLabLink.kt
@@ -0,0 +1,4 @@
+package com.apkupdater.data.gitlab
+
+
+data class GitLabLink(val url: String)
diff --git a/app/src/main/kotlin/com/apkupdater/di/MainModule.kt b/app/src/main/kotlin/com/apkupdater/di/MainModule.kt
@@ -127,9 +127,10 @@ val mainModule = module {
 
 	single {
 		val client = OkHttpClient.Builder().followRedirects(true).cache(get()).build()
+		val auroraClient = OkHttpClient.Builder().followRedirects(true).cache(get()).addUserAgentInterceptor("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36").build()
 		val apkPureClient = OkHttpClient.Builder().followRedirects(true).cache(get()).addUserAgentInterceptor("APKPure/3.19.39 (Aegon)").build()
 		val dir = File(androidContext().cacheDir, "downloads").apply { mkdirs() }
-		Downloader(client, apkPureClient, dir)
+		Downloader(client, apkPureClient, auroraClient, dir)
 	}
 
 	single { ApkMirrorRepository(get(), get(), androidContext().packageManager) }

diff --git a/app/src/main/kotlin/com/apkupdater/repository/GitLabRepository.kt b/app/src/main/kotlin/com/apkupdater/repository/GitLabRepository.kt
@@ -100,15 +100,11 @@ class GitLabRepository(
     ): String {
         // TODO: Take into account arch
         val source = release.assets.sources.find { it.url.endsWith(".apk", true) }
-        if (source != null) {
-            return source.url
-        } else if (packageName == "com.aurora.store") {
-            // For whatever reason Aurora doesn't store the APK as an asset.
-            // Instead there is a markdown link to the APK.
-            Regex("\\[(.+)]\\(([^ ]+?)( \"(.+)\")?\\)").find(release.description)?.let {
-                return "https://gitlab.com/AuroraOSS/AuroraStore" + it.groups[2]!!.value
-            }
-        }
+        if (source != null) return source.url
+
+        val link = release.assets.links.find { it.url.endsWith(".apk", true) }
+        if (link != null) return link.url
+
         return ""
     }
 

diff --git a/app/src/main/kotlin/com/apkupdater/util/Downloader.kt b/app/src/main/kotlin/com/apkupdater/util/Downloader.kt
@@ -10,6 +10,7 @@ import java.io.InputStream
 class Downloader(
     private val client: OkHttpClient,
     private val apkPureClient: OkHttpClient,
+    private val auroraClient: OkHttpClient,
     private val dir: File
 ) {
 
@@ -26,6 +27,7 @@ class Downloader(
     fun downloadStream(url: String): InputStream? = runCatching {
         val c = when {
             url.contains("apkpure") -> apkPureClient
+            url.contains("aurora") -> auroraClient
             else -> client
         }
         val response = c.newCall(downloadRequest(url)).execute()