Merge remote-tracking branch 'upstream/master'

mywalkb · Sep 12, 2023 · 638a59c · 638a59c
2 parents 174743c + b2ab117
commit 638a59c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/daemon/src/main/java/org/lsposed/lspd/service/ConfigManager.java b/daemon/src/main/java/org/lsposed/lspd/service/ConfigManager.java
@@ -1188,6 +1188,7 @@ private void removeModulePrefs(int uid, String packageName) throws IOException {
     public List<String> getDenyListPackages() {
         List<String> result = new ArrayList<>();
         if (!getApi().equals("Zygisk")) return result;
+        if (!ConfigFileManager.magiskDbPath.exists()) return result;
         try (final SQLiteDatabase magiskDb =
                      SQLiteDatabase.openDatabase(ConfigFileManager.magiskDbPath, new SQLiteDatabase.OpenParams.Builder().addOpenFlags(SQLiteDatabase.OPEN_READONLY).build())) {
             try (Cursor cursor = magiskDb.query("settings", new String[]{"value"}, "`key`=?", new String[]{"denylist"}, null, null, null)) {

diff --git a/external/dobby b/external/dobby
diff --git a/external/lsplant b/external/lsplant
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.1.1"
 kotlin = "1.9.10"
-nav = "2.7.1"
+nav = "2.7.2"
 appcenter = "5.0.2"
 libxposed = "100"
 glide = "4.16.0"
@@ -36,10 +36,10 @@ rikkax-widget-borderview = { module = "dev.rikka.rikkax.widget:borderview", vers
 rikkax-widget-mainswitchbar = { module = "dev.rikka.rikkax.widget:mainswitchbar", version = "1.0.2" }
 
 androidx-activity = { module = "androidx.activity:activity", version = "1.7.2" }
-androidx-annotation = { module = "androidx.annotation:annotation", version = "1.6.0" }
+androidx-annotation = { module = "androidx.annotation:annotation", version = "1.7.0" }
 androidx-browser = { module = "androidx.browser:browser", version = "1.6.0" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" }
-androidx-core = { module = "androidx.core:core", version = "1.10.1" }
+androidx-core = { module = "androidx.core:core", version = "1.12.0" }
 androidx-fragment = { module = "androidx.fragment:fragment", version = "1.6.1" }
 androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "nav" }
 androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "nav" }
+20 −0		.github/dependabot.yml
+5 −1		.github/workflows/build.yml
+6 −6		.github/workflows/pages.yml
+1 −1		README.md
+6 −2		build.gradle.kts
+2 −0		gradle.properties
+17 −0		gradle/libs.versions.toml
+1 −1		gradle/wrapper/gradle-wrapper.properties
+40 −138		lsplant/build.gradle.kts
+1 −1		lsplant/src/main/jni/art/runtime/dex_file.hpp
+2 −2		lsplant/src/main/jni/art/runtime/instrumentation.hpp
+53 −9		lsplant/src/main/jni/lsplant.cc
+0 −4		settings.gradle.kts
+6 −5		test/build.gradle.kts