From 5b60fd3d8226b6401594d750d89351451db2b50a Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Mon, 23 May 2022 14:49:12 +0800 Subject: [PATCH 1/5] Update .gitignore --- .gitignore | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index aa724b7..13afc13 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,17 @@ .externalNativeBuild .cxx local.properties +*.apk +*.ap_ +*.aab +*.dex +*.class +bin/ +gen/ +Thumbs.db +.idea +build/ +.navigation +captures/ +output.json +obj/ \ No newline at end of file From dede6f8bcf7d5abfc88ba01bc87e76096e5fa9ec Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Mon, 23 May 2022 17:56:17 +0800 Subject: [PATCH 2/5] Fix#4 --- app/src/main/java/org/lsposed/wsa/helper/MainActivity.kt | 4 ++-- app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/lsposed/wsa/helper/MainActivity.kt b/app/src/main/java/org/lsposed/wsa/helper/MainActivity.kt index ceb8239..f1857d9 100644 --- a/app/src/main/java/org/lsposed/wsa/helper/MainActivity.kt +++ b/app/src/main/java/org/lsposed/wsa/helper/MainActivity.kt @@ -16,7 +16,6 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val installReceiver: BroadcastReceiver? = getWSAInstallReceiver(this) setContent { val colorScheme = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (isSystemInDarkTheme()) @@ -28,11 +27,12 @@ class MainActivity : ComponentActivity() { MaterialTheme( colorScheme = colorScheme ) { + val installReceiver: BroadcastReceiver? = getWSAInstallReceiver(this) if (installReceiver == null || (applicationInfo.flags or ApplicationInfo.FLAG_SYSTEM) == 0) { AlertDialog( onDismissRequest = { finish() }, title = { - Text("Failed to initialized") + Text("Failed to initialized\ninstallReceiver=$installReceiver") }, confirmButton = {} ) diff --git a/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt b/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt index 7a951ff..703c9c9 100644 --- a/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt +++ b/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt @@ -6,6 +6,7 @@ import android.util.Log import dalvik.system.PathClassLoader private var installReceiver: BroadcastReceiver? = null +const val TAG: String = "LSPosed WSA Helper" fun getWSAInstallReceiver(context: Context) = runCatching { if (installReceiver != null) return@runCatching installReceiver @@ -16,10 +17,10 @@ fun getWSAInstallReceiver(context: Context) = runCatching { val ctor = handlerClass.getConstructor(Context::class.java) ctor.newInstance(object : ContextWrapper(context) { fun onRegister(receiver: BroadcastReceiver?, filter: IntentFilter) { - Log.d("LSPosed", "skip receiver") + Log.d(TAG, "skip receiver") if (filter.hasAction(Intent.ACTION_PACKAGE_ADDED) && receiver != null) { installReceiver = receiver - Log.i("LSPosed", "got install receiver") + Log.i(TAG, "got install receiver") } } From 2dfbf384cdde40983ac80c59cc71ff883c64aaa3 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Mon, 23 May 2022 18:13:39 +0800 Subject: [PATCH 3/5] 1 --- app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt b/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt index 703c9c9..6c81f80 100644 --- a/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt +++ b/app/src/main/java/org/lsposed/wsa/helper/WSAUtils.kt @@ -17,8 +17,10 @@ fun getWSAInstallReceiver(context: Context) = runCatching { val ctor = handlerClass.getConstructor(Context::class.java) ctor.newInstance(object : ContextWrapper(context) { fun onRegister(receiver: BroadcastReceiver?, filter: IntentFilter) { - Log.d(TAG, "skip receiver") - if (filter.hasAction(Intent.ACTION_PACKAGE_ADDED) && receiver != null) { + Log.d(TAG, "skip receiver, filter: ${filter.actionsIterator().next()}") + if ((filter.hasAction(Intent.ACTION_PACKAGE_ADDED) || + filter.hasAction("com.microsoft.windows.app.packageinstall.INTENT_PACKAGE_UNINSTALL_COMMIT")) && receiver != null + ) { installReceiver = receiver Log.i(TAG, "got install receiver") } From 454d2cc39cd42cc720f164feb2716e7c9b30b781 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Mon, 23 May 2022 23:25:55 +0800 Subject: [PATCH 4/5] Upgrade AGP and dependencies --- app/build.gradle.kts | 5 +++-- app/src/main/AndroidManifest.xml | 3 +-- build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- stub/build.gradle.kts | 1 + stub/src/main/AndroidManifest.xml | 1 - 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3a0e699..740f85d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,13 +68,14 @@ android { excludes += "/META-INF/{AL2.0,LGPL2.1}" } } + namespace = "org.lsposed.wsa.helper" } dependencies { implementation("androidx.compose.ui:ui:$composeVersion") - implementation("androidx.compose.material3:material3:1.0.0-alpha02") + implementation("androidx.compose.material3:material3:1.0.0-alpha12") implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion") implementation("androidx.activity:activity-compose:1.4.0") - implementation("com.google.accompanist:accompanist-drawablepainter:0.21.4-beta") + implementation("com.google.accompanist:accompanist-drawablepainter:0.23.1") debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion") } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ebd9ff7..3ca3d55 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> From 76a6f4e981d1b9beaeb111841c7e8f52dfa6aadf Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Mon, 30 May 2022 20:39:28 +0800 Subject: [PATCH 5/5] Upgrade AGP --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 00572f6..55067de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.2.0") + classpath("com.android.tools.build:gradle:7.2.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") // NOTE: Do not place your application dependencies here; they belong