Merge pull request #11 from beebird/master

support LSPosed API 101

Author: Young-Lord

app/build.gradle

@@ -1,11 +1,12 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
     namespace 'moe.lyniko.hiderecent'
-    compileSdk 34
+    compileSdk 36
 
     defaultConfig {
         applicationId "moe.lyniko.hiderecent"
@@ -28,19 +29,16 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         buildConfig true
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.4.3'
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -49,21 +47,21 @@ android {
 }
 
 dependencies {
-    // module stuff
     compileOnly 'de.robv.android.xposed:api:82'
+
     implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.3'
     def shizuku_version = '13.1.5'
     implementation "dev.rikka.shizuku:api:$shizuku_version"
     implementation "dev.rikka.shizuku:provider:$shizuku_version"
     implementation 'me.zhanghai.compose.preference:library:1.0.0'
 
     // ui stuff
-    implementation "com.google.accompanist:accompanist-drawablepainter:0.28.0"
+    implementation "com.google.accompanist:accompanist-drawablepainter:0.36.0"
     implementation "androidx.navigation:navigation-compose:2.7.6"
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
     implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation platform('androidx.compose:compose-bom:2024.12.01')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'

app/src/main/AndroidManifest.xml

@@ -15,6 +15,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.HideRecentTask"
         android:name="moe.lyniko.hiderecent.MyApplication"
+        android:description="@string/xposeddescription"
         tools:targetApi="31">
         <meta-data
             android:name="xposedmodule"
@@ -43,7 +44,7 @@
             android:name=".LauncherActivity"
             android:enabled="true"
             android:exported="true"
-            android:targetActivity="${applicationId}.MainActivity">
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/moe/lyniko/hiderecent/MainActivity.kt

@@ -34,13 +34,7 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        try {
-            PreferenceUtils.getInstance(this)
-        } catch (e: SecurityException) {
-            Toast.makeText(this, getString(R.string.not_activated), Toast.LENGTH_LONG).show()
-            finish()
-            return
-        }
+        PreferenceUtils.getInstance(this)
         setContent {
             MyApplicationTheme {
 

app/src/main/java/moe/lyniko/hiderecent/MainHook.kt

@@ -19,12 +19,8 @@ class MainHook : IXposedHookLoadPackage {
     private fun onAppHooked(lpparam: LoadPackageParam) {
         val visibleFilterHook: XC_MethodHook = object : XC_MethodHook() {
             override fun beforeHookedMethod(param: MethodHookParam) {
+                if (!loaded) tryLoadPackages()
                 val intent = callMethod(param.args[0], "getBaseIntent") as Intent
-                if (BuildConfig.DEBUG) {
-                    XposedBridge.log("Hide - Current Intent: $intent")
-                    XposedBridge.log("Hide - Current component: ${intent.component}")
-                    XposedBridge.log("Hide - Current package: ${intent.component?.packageName}")
-                }
                 val packageName = intent.component?.packageName ?: return
                 if (packages.contains(packageName)) {
                     param.result = false
@@ -39,16 +35,29 @@ class MainHook : IXposedHookLoadPackage {
                 "com.android.server.wm.Task",
                 visibleFilterHook
             )
-        } catch (ignored: Throwable) {
+            XposedBridge.log("HideRecent: hook installed, packages=$packages")
+        } catch (t: Throwable) {
+            XposedBridge.log("HideRecent: hook FAILED")
+            XposedBridge.log(t)
         }
     }
 
-    private val packages: MutableSet<String>
+    @Volatile
+    private var packages: Set<String> = emptySet()
+    @Volatile
+    private var loaded = false
 
-    init {
-        val xsp =
-            XSharedPreferences(BuildConfig.APPLICATION_ID, PreferenceUtils.functionalConfigName)
+    private fun tryLoadPackages() {
+        val xsp = XSharedPreferences(BuildConfig.APPLICATION_ID, PreferenceUtils.functionalConfigName)
         xsp.makeWorldReadable()
-        packages = PreferenceUtils.getPackageListFromPref(xsp)
+        val pkgs = PreferenceUtils.getPackageListFromPref(xsp)
+        if (pkgs.isNotEmpty()) {
+            packages = pkgs
+            loaded = true
+        }
+    }
+
+    init {
+        tryLoadPackages()
     }
 }

app/src/main/java/moe/lyniko/hiderecent/utils/AppUtils.kt

@@ -165,26 +165,27 @@ class ParsedPackage(
 ) {
     // lazy init
     val appName: String by lazy {
-        packageManager.getApplicationLabel(pkg.applicationInfo).toString()
+        val appInfo = pkg.applicationInfo ?: return@lazy pkg.packageName
+        packageManager.getApplicationLabel(appInfo).toString()
     }
     val appIcon: Drawable by lazy {
-        pkg.applicationInfo.loadIcon(packageManager)
+        pkg.applicationInfo?.loadIcon(packageManager) ?: packageManager.defaultActivityIcon
     }
     val packageName: String by lazy {
         pkg.packageName
     }
 
     @Suppress("unused")
     val versionName: String by lazy {
-        pkg.versionName
+        pkg.versionName ?: ""
     }
 
     @Suppress("unused")
     val versionCode: Long by lazy {
         pkg.longVersionCode
     }
     val isSystemApp: Boolean by lazy {
-        (pkg.applicationInfo.flags and android.content.pm.ApplicationInfo.FLAG_SYSTEM) != 0
+        (pkg.applicationInfo?.flags?.and(android.content.pm.ApplicationInfo.FLAG_SYSTEM) ?: 0) != 0
     }
     private val packageNameLowerCase: String by lazy {
         packageName.lowercase()

app/src/main/java/moe/lyniko/hiderecent/utils/PreferenceUtils.kt

@@ -10,22 +10,14 @@ import moe.lyniko.hiderecent.R
 class PreferenceUtils( // init context on constructor
     context: Context
 ) {
-    // ------ 1. get several SharedPreferences (funcPref is the only accessible during Xposed inject) ------
-    private var funcPref: SharedPreferences = try {
-        @Suppress("DEPRECATION")
-        context.getSharedPreferences(functionalConfigName, Context.MODE_WORLD_READABLE)
-    } catch (e: SecurityException) {
-        throw e
-        // Log.w("PreferenceUtil", "Fallback to Private SharedPref for error!!!: ${e.message}")
-        // context.getSharedPreferences(functionalConfigName, Context.MODE_PRIVATE)
-    }
+    // ------ 1. get several SharedPreferences ------
+    // Vector/LSPosed hooks checkMode to allow MODE_WORLD_READABLE when the module
+    // is in its own scope. Fall back to MODE_PRIVATE if the hook isn't active.
+    private var funcPref: SharedPreferences = openWorldReadable(context, functionalConfigName)
 
-    @Suppress("DEPRECATION")
-    var managerPref: SharedPreferences =
-        context.getSharedPreferences(managerConfigName, Context.MODE_WORLD_READABLE)
+    var managerPref: SharedPreferences = openWorldReadable(context, managerConfigName)
 
-    @Suppress("DEPRECATION")
-    private val legacyFuncPref = context.getSharedPreferences(legacyConfigName, Context.MODE_WORLD_READABLE)
+    private val legacyFuncPref = openWorldReadable(context, legacyConfigName)
 
     // ------ 2. init packages ------
     private fun initPackageFromLegacyAndNew(funcPref: SharedPreferences, legacyPref: SharedPreferences) {
@@ -58,6 +50,15 @@ class PreferenceUtils( // init context on constructor
                 instance ?: PreferenceUtils(context).also { instance = it }
             }
 
+        @Suppress("DEPRECATION")
+        private fun openWorldReadable(context: Context, name: String): SharedPreferences {
+            return try {
+                context.getSharedPreferences(name, Context.MODE_WORLD_READABLE)
+            } catch (_: SecurityException) {
+                context.getSharedPreferences(name, Context.MODE_PRIVATE)
+            }
+        }
+
         private const val packagesTag = "packages"
         const val functionalConfigName = "functional_config"
         const val managerConfigName = "manager_config"

app/src/main/res/values/strings.xml

@@ -9,6 +9,7 @@
     <string name="not_activated">Please activate this module in LSPosed Manager, then force stop.</string>
     <string-array name="xposedscope" translatable="false">
         <item>android</item>
+        <item>moe.lyniko.hiderecent</item>
     </string-array>
     <string name="title_home">Home</string>
     <string name="title_settings">Settings</string>

build.gradle

@@ -1,6 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
+    id 'com.android.application' version '8.13.0' apply false
+    id 'com.android.library' version '8.13.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.3.0' apply false
+    id 'org.jetbrains.kotlin.plugin.compose' version '2.3.0' apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Dec 16 19:53:24 GMT+08:00 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists