From 7403a17b825dd7de97efea02cafde141fbf53889 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Tue, 25 May 2021 11:03:01 +0800
Subject: [PATCH] Make AS happy  (#672)

* Suppress error

* Register data binding generated files
---
 app/build.gradle.kts                              | 15 ++++++++++++++-
 .../org/lsposed/lspd/service/ConfigManager.java   | 11 +++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 65f9a79a..b82f1a21 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,10 +22,24 @@ import com.android.build.gradle.internal.dsl.BuildType
 import java.nio.file.Paths
 
 plugins {
+    id("org.gradle.idea")
     id("com.android.application")
     kotlin("android")
 }
 
+// workaround for AS.
+val dataBinding = file("${project.buildDir}/generated/data_binding_base_class_source_out/debug/out")
+sourceSets {
+    create("dataBinding") {
+        java.srcDir(dataBinding)
+    }
+}
+idea {
+    module {
+        generatedSourceDirs.add(dataBinding)
+    }
+}
+
 val androidTargetSdkVersion: Int by rootProject.extra
 val androidMinSdkVersion: Int by rootProject.extra
 val androidBuildToolsVersion: String by rootProject.extra
@@ -229,4 +243,3 @@ configurations.all {
         exclude(group = "androidx.appcompat", module = "appcompat")
     }
 }
-
diff --git a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
index 6faa1041..c614e47c 100644
--- a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
+++ b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
@@ -124,8 +124,8 @@ public class ConfigManager {
     private boolean sepolicyLoaded = true;
 
     static class ProcessScope {
-        String processName;
-        int uid;
+        final String processName;
+        final int uid;
 
         ProcessScope(@NonNull String processName, int uid) {
             this.processName = processName;
@@ -367,6 +367,7 @@ public class ConfigManager {
                     obsoleteScopes.add(module);
                 } else {
                     var info = pkgInfo.get(userId);
+                    assert info != null;
                     cachedModule.computeIfAbsent(info.applicationInfo.uid % PER_USER_RANGE, k -> info.packageName);
                 }
             }
@@ -436,9 +437,7 @@ public class ConfigManager {
         Log.d(TAG, "cached Scope");
         cachedScope.forEach((ps, module) -> {
             Log.d(TAG, ps.processName + "/" + ps.uid);
-            module.forEach((pkg_name, apk_path) -> {
-                Log.d(TAG, "\t" + pkg_name);
-            });
+            module.forEach((pkg_name, apk_path) -> Log.d(TAG, "\t" + pkg_name));
         });
     }
 
@@ -508,7 +507,7 @@ public class ConfigManager {
             if (cursor == null) return -1;
             if (cursor.getCount() != 1) return -1;
             cursor.moveToFirst();
-            return cursor.getInt(cursor.getColumnIndex("mid"));
+            return cursor.getInt(cursor.getColumnIndexOrThrow("mid"));
         }
     }