Android11以上安装未知来源变更

wandersnail · Aug 15, 2024 · 43e4b29 · 43e4b29
1 parent 9a6114e
commit 43e4b29
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-def lib_version = '1.3.7'
+def lib_version = '1.3.8'
 def user_name = 'wandersnail'
 def lib_group = 'cn.wandersnail'
 def lib_artifact = 'commons-android'

diff --git a/library/src/main/java/cn/wandersnail/commons/helper/ApkInstallHelper.java b/library/src/main/java/cn/wandersnail/commons/helper/ApkInstallHelper.java
@@ -44,7 +44,9 @@ public void onActivityResult(int requestCode) {
      */
     public void install() {
         Objects.requireNonNull(apkFile, "apkFile is null");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !activity.getPackageManager().canRequestPackageInstalls()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.R &&
+                !activity.getPackageManager().canRequestPackageInstalls()) {
             Uri uri = Uri.parse("package:" + activity.getPackageName());
             Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, uri);
             activity.startActivityForResult(intent, REQUEST_CODE);

diff --git a/library/src/main/java/cn/wandersnail/commons/helper/ApkInstaller.java b/library/src/main/java/cn/wandersnail/commons/helper/ApkInstaller.java
@@ -77,7 +77,8 @@ private void onActivityResult() {
     public void install() {
         Activity activity = getActivity();
         if (activity != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && 
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+                    Build.VERSION.SDK_INT < Build.VERSION_CODES.R &&
                     !activity.getPackageManager().canRequestPackageInstalls()) {
                 Uri uri = Uri.parse("package:" + activity.getPackageName());
                 Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, uri);