From 594c304634617818d9b6e09dbc88da388160b8fe Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Mon, 27 Feb 2023 11:57:22 +0800
Subject: [PATCH] Fix release build

---
 app/.gitignore                                              | 6 +++---
 app/shared/src/main/AndroidManifest.xml                     | 4 ++++
 .../java/com/topjohnwu/magisk/core/di/ServiceLocator.kt     | 1 -
 .../com/topjohnwu/magisk/core/repository/NetworkService.kt  | 4 +---
 buildSrc/src/main/java/Setup.kt                             | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/.gitignore b/app/.gitignore
index 50b291029..c4ff2b1c6 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -7,6 +7,6 @@ app/release
 *.hprof
 .externalNativeBuild/
 *.apk
-src/main/assets
-src/main/jniLibs
-src/main/resources
+src/*/assets
+src/*/jniLibs
+src/*/resources
diff --git a/app/shared/src/main/AndroidManifest.xml b/app/shared/src/main/AndroidManifest.xml
index 0edea0fff..188b4e220 100644
--- a/app/shared/src/main/AndroidManifest.xml
+++ b/app/shared/src/main/AndroidManifest.xml
@@ -9,6 +9,10 @@
     <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
     <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage"
+        tools:node="remove" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29"
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt b/app/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt
index 9669c59dd..c206a39bf 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt
@@ -39,7 +39,6 @@ object ServiceLocator {
         NetworkService(
             createApiService(retrofit, Const.Url.GITHUB_PAGE_URL),
             createApiService(retrofit, Const.Url.GITHUB_RAW_URL),
-            createApiService(retrofit, Const.Url.GITHUB_API_URL)
         )
     }
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/repository/NetworkService.kt b/app/src/main/java/com/topjohnwu/magisk/core/repository/NetworkService.kt
index ece989a95..18cb1e7ef 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/repository/NetworkService.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/repository/NetworkService.kt
@@ -8,7 +8,6 @@ import com.topjohnwu.magisk.core.Config.Value.DEBUG_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.DEFAULT_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.STABLE_CHANNEL
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.data.GithubApiServices
 import com.topjohnwu.magisk.core.data.GithubPageServices
 import com.topjohnwu.magisk.core.data.RawServices
 import retrofit2.HttpException
@@ -17,8 +16,7 @@ import java.io.IOException
 
 class NetworkService(
     private val pages: GithubPageServices,
-    private val raw: RawServices,
-    private val api: GithubApiServices
+    private val raw: RawServices
 ) {
     suspend fun fetchUpdate() = safe {
         var info = when (Config.updateChannel) {
diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
index 0c2a4a949..dc25e2998 100644
--- a/buildSrc/src/main/java/Setup.kt
+++ b/buildSrc/src/main/java/Setup.kt
@@ -220,7 +220,7 @@ fun Project.setupApp() {
             dependsOn(stubTask)
             inputs.property("version", Config.version)
             inputs.property("versionCode", Config.versionCode)
-            into("src/main/assets")
+            into("src/${this@all.name}/assets")
             from(rootProject.file("scripts")) {
                 include("util_functions.sh", "boot_patch.sh", "addon.d.sh")
                 include("uninstaller.sh", "module_installer.sh")