6.6.1 - Alpha3 - 修复打包应用可能出现的 DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION 权限冲突

Author: SuperMonster003

app/src/main/java/org/autojs/autojs/apkbuilder/ManifestEditor.java

@@ -101,6 +101,13 @@ private class MutableNodeImpl extends AxmlWriter.NodeImpl {
 
             @Override
             protected void onAttr(AxmlWriter.Attr a) {
+                if ("permission".equals(this.name.data) && "name".equals(a.name.data) && a.value instanceof StringItem) {
+                    if ("org.autojs.autojs6.inrt.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION".equals(((StringItem) a.value).data)) {
+                        ((StringItem) a.value).data = mPackageName + ".DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION";
+                        super.onAttr(a);
+                        return;
+                    }
+                }
                 if ("uses-permission".equals(this.name.data) && "name".equals(a.name.data) && a.value instanceof StringItem) {
                     this.ignore = !ManifestEditor.this.isPermissionRequired(((StringItem) a.value).data);
                 }

libs/utils.build.gradle

@@ -414,11 +414,12 @@ class Utils {
                             while ((bytesRead = inputStream.read(buffer)) != -1) {
                                 outputStream.write(buffer, 0, bytesRead)
                                 downloadedSize += bytesRead
-
-                                double progress = (downloadedSize * 100.0 / fileSize)
-                                String progressBar = generateProgressBar(progress)
-                                print String.format("\rDownloading... [ %s ] %.2f%%", progressBar, progress)
-                                System.out.flush()
+                                if (project.ext["platform"]["shouldPrintProgress"] == true) {
+                                    double progress = (downloadedSize * 100.0 / fileSize)
+                                    String progressBar = generateProgressBar(progress)
+                                    print String.format("\rDownloading... [ %s ] %.2f%%", progressBar, progress)
+                                    System.out.flush()
+                                }
                             }
                         }
                     }
@@ -489,11 +490,12 @@ class Utils {
                         }
                     }
 
-                    double progress = (processedEntries * 100.0 / totalEntries)
-                    String progressBar = generateProgressBar(progress)
-                    print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress)
-                    System.out.flush()
-
+                    if (project.ext["platform"]["shouldPrintProgress"] == true) {
+                        double progress = (processedEntries * 100.0 / totalEntries)
+                        String progressBar = generateProgressBar(progress)
+                        print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress)
+                        System.out.flush()
+                    }
                     processedEntries++
                 }
             }
@@ -555,11 +557,12 @@ class Utils {
                         }
                     }
 
-                    double progress = (processedEntries * 100.0 / totalEntries)
-                    String progressBar = generateProgressBar(progress)
-                    print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress)
-                    System.out.flush()
-
+                    if (project.ext["platform"]["shouldPrintProgress"] == true) {
+                        double progress = (processedEntries * 100.0 / totalEntries)
+                        String progressBar = generateProgressBar(progress)
+                        print String.format("\rExtracting... [ %s ] %.2f%%", progressBar, progress)
+                        System.out.flush()
+                    }
                     processedEntries++
                 }
             }

settings.gradle.kts

@@ -234,6 +234,7 @@ pluginManagement {
                 ),
             ) {
                 override val weight = 5
+                override val shouldPrintProgress = false
             }
 
             val unknown = object : Platform(
@@ -355,6 +356,7 @@ pluginManagement {
             open val gradleSettingsName: String? = null
             open val weight: Int = -Int.MAX_VALUE
             open var version: String = consts.DEFAULT_VERSION
+            open val shouldPrintProgress: Boolean = true
 
             open val fullName
                 get() = uppercaseFirstChar(name)
@@ -626,6 +628,7 @@ pluginManagement {
         extensions.extraProperties["kotlinVersion"] = notations.classpath.find {
             it.contains("kotlin-gradle-plugin")
         }?.substringAfterLast(":") ?: config.fallbackKotlinVersion
+        extensions.extraProperties["platform"] = platform
     }
 
 }

version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 01 12:09:07 CST 2025
-BUILD_TIME=1735704547526
+#Wed Jan 01 13:21:24 CST 2025
+BUILD_TIME=1735708884520
 COMPILE_SDK_VERSION=34
 JAVA_VERSION=23
 JAVA_VERSION_MIN_RADICAL=0
@@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
 TARGET_SDK_VERSION=34
 TARGET_SDK_VERSION_INRT=29
-VERSION_BUILD=2939
+VERSION_BUILD=2940
 VERSION_NAME=6.6.1 Alpha3
 VSCODE_EXT_REQUIRED_VERSION=1.0.8