From 8c1ea074e412a70edafcb49f5b8243004dc8343a Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Tue, 9 Sep 2025 03:54:52 +0300 Subject: [PATCH 01/16] Fix signing info bug, simplify PmsHook, add caf and calyxos to custom ROM preset --- .../common/app_presets/CustomROMPreset.kt | 10 +++ .../xposed/hook/PmsHookTarget28.kt | 35 ++------ .../xposed/hook/PmsHookTarget30.kt | 76 ++-------------- .../xposed/hook/PmsHookTarget33.kt | 72 ++-------------- .../xposed/hook/PmsHookTarget34.kt | 74 ++-------------- .../xposed/hook/PmsHookTargetBase.kt | 86 +++++++++++++++++++ 6 files changed, 119 insertions(+), 234 deletions(-) create mode 100644 xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt index d4fea46..96e6c4d 100644 --- a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt +++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt @@ -21,6 +21,16 @@ class CustomROMPreset() : BasePreset("custom_rom") { return true } + // CAF (CodeAuroraForum) apps + if (packageName.startsWith("com.caf.")) { + return true + } + + // CalyxOS + if (packageName.startsWith("org.calyxos.")) { + return true + } + // AOSPA if (packageName.startsWith("co.aospa.")) { return true diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt index 0b2b160..873947a 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt @@ -16,14 +16,15 @@ import icu.nullptr.hidemyapplist.xposed.logE import icu.nullptr.hidemyapplist.xposed.logI import java.util.concurrent.atomic.AtomicReference -class PmsHookTarget28(private val service: HMAService) : IFrameworkHook { +class PmsHookTarget28(service: HMAService) : PmsHookTargetBase(service) { companion object { private const val TAG = "PmsHookTarget28" } - private val hooks = mutableListOf() - private var lastFilteredApp: AtomicReference = AtomicReference(null) + // not required until SDK 30 + override val fakeSystemPackageInstallInfo = null + override val fakeUserPackageInstallInfo = null @Suppress("UNCHECKED_CAST") override fun load() { @@ -88,32 +89,6 @@ class PmsHookTarget28(private val service: HMAService) : IFrameworkHook { } } - hooks += findMethod(service.pms::class.java, findSuper = true) { - name == "getInstallerPackageName" - }.hookBefore { param -> - val targetApp = param.args[0] as String? - - val callingUid = Binder.getCallingUid() - if (callingUid == Constants.UID_SYSTEM) return@hookBefore - val callingApps = Utils.binderLocalScope { - service.pms.getPackagesForUid(callingUid) - } ?: return@hookBefore - for (caller in callingApps) { - val blockingMode = service.shouldHideInstallationSource(caller, targetApp) - when (blockingMode) { - 1 -> param.result = VENDING_PACKAGE_NAME - 2 -> param.result = null - else -> continue - } - - service.filterCount++ - break - } - } - } - - override fun unload() { - hooks.forEach(XC_MethodHook.Unhook::unhook) - hooks.clear() + super.load() } } diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt index c1cfdeb..e33585b 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt @@ -1,14 +1,12 @@ package icu.nullptr.hidemyapplist.xposed.hook -import android.os.Binder +import android.content.pm.PackageManager import android.os.Build import androidx.annotation.RequiresApi import com.github.kyuubiran.ezxhelper.utils.findConstructor import com.github.kyuubiran.ezxhelper.utils.findMethod -import com.github.kyuubiran.ezxhelper.utils.findMethodOrNull import com.github.kyuubiran.ezxhelper.utils.hookBefore import com.github.kyuubiran.ezxhelper.utils.paramCount -import de.robv.android.xposed.XC_MethodHook import icu.nullptr.hidemyapplist.common.Constants import icu.nullptr.hidemyapplist.common.Constants.VENDING_PACKAGE_NAME import icu.nullptr.hidemyapplist.common.Utils @@ -17,16 +15,15 @@ import icu.nullptr.hidemyapplist.xposed.Utils4Xposed import icu.nullptr.hidemyapplist.xposed.logD import icu.nullptr.hidemyapplist.xposed.logE import icu.nullptr.hidemyapplist.xposed.logI -import java.util.concurrent.atomic.AtomicReference @RequiresApi(Build.VERSION_CODES.R) -class PmsHookTarget30(private val service: HMAService) : IFrameworkHook { +class PmsHookTarget30(service: HMAService) : PmsHookTargetBase(service) { companion object { private const val TAG = "PmsHookTarget30" } - private val fakeSystemPackageInstallInfo by lazy { + override val fakeSystemPackageInstallInfo: Any by lazy { findConstructor( "android.content.pm.InstallSourceInfo" ) { @@ -39,29 +36,19 @@ class PmsHookTarget30(private val service: HMAService) : IFrameworkHook { ) } - private val fakeUserPackageInstallInfo by lazy { - var psInfo = Utils.getPackageInfoCompat( - service.pms, - VENDING_PACKAGE_NAME, - 0L, - 0 - ).signingInfo - + override val fakeUserPackageInstallInfo: Any by lazy { findConstructor( "android.content.pm.InstallSourceInfo" ) { paramCount == 4 }.newInstance( VENDING_PACKAGE_NAME, - psInfo, + psSigningInfo, VENDING_PACKAGE_NAME, VENDING_PACKAGE_NAME, ) } - private val hooks = mutableSetOf() - private var lastFilteredApp: AtomicReference = AtomicReference(null) - override fun load() { logI(TAG, "Load hook") hooks += findMethod("com.android.server.pm.AppsFilter") { @@ -90,57 +77,6 @@ class PmsHookTarget30(private val service: HMAService) : IFrameworkHook { } } - findMethodOrNull(service.pms::class.java, findSuper = true) { - name == "getInstallSourceInfo" - }?.hookBefore { param -> - val targetApp = param.args[0] as String? - - val callingUid = Binder.getCallingUid() - if (callingUid == Constants.UID_SYSTEM) return@hookBefore - val callingApps = Utils.binderLocalScope { - service.pms.getPackagesForUid(callingUid) - } ?: return@hookBefore - for (caller in callingApps) { - val blockingMode = service.shouldHideInstallationSource(caller, targetApp) - when (blockingMode) { - 1 -> param.result = fakeUserPackageInstallInfo - 2 -> param.result = fakeSystemPackageInstallInfo - else -> continue - } - - service.filterCount++ - break - } - }?.let { - hooks.add(it) - } - - hooks += findMethod(service.pms::class.java, findSuper = true) { - name == "getInstallerPackageName" - }.hookBefore { param -> - val targetApp = param.args[0] as String? - - val callingUid = Binder.getCallingUid() - if (callingUid == Constants.UID_SYSTEM) return@hookBefore - val callingApps = Utils.binderLocalScope { - service.pms.getPackagesForUid(callingUid) - } ?: return@hookBefore - for (caller in callingApps) { - val blockingMode = service.shouldHideInstallationSource(caller, targetApp) - when (blockingMode) { - 1 -> param.result = VENDING_PACKAGE_NAME - 2 -> param.result = null - else -> continue - } - - service.filterCount++ - break - } - } - } - - override fun unload() { - hooks.forEach(XC_MethodHook.Unhook::unhook) - hooks.clear() + super.load() } } diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt index a71d602..a5688a7 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt @@ -1,6 +1,7 @@ package icu.nullptr.hidemyapplist.xposed.hook import android.content.pm.PackageInstaller +import android.content.pm.PackageManager import android.os.Binder import android.os.Build import androidx.annotation.RequiresApi @@ -21,7 +22,7 @@ import icu.nullptr.hidemyapplist.xposed.logI import java.util.concurrent.atomic.AtomicReference @RequiresApi(Build.VERSION_CODES.TIRAMISU) -class PmsHookTarget33(private val service: HMAService) : IFrameworkHook { +class PmsHookTarget33(service: HMAService) : PmsHookTargetBase(service) { companion object { private const val TAG = "PmsHookTarget33" @@ -33,7 +34,7 @@ class PmsHookTarget33(private val service: HMAService) : IFrameworkHook { } } - private val fakeSystemPackageInstallInfo by lazy { + override val fakeSystemPackageInstallInfo: Any by lazy { findConstructor( "android.content.pm.InstallSourceInfo" ) { @@ -47,30 +48,20 @@ class PmsHookTarget33(private val service: HMAService) : IFrameworkHook { ) } - private val fakeUserPackageInstallInfo by lazy { - var psInfo = Utils.getPackageInfoCompat( - service.pms, - VENDING_PACKAGE_NAME, - 0L, - 0 - ).signingInfo - + override val fakeUserPackageInstallInfo: Any by lazy { findConstructor( "android.content.pm.InstallSourceInfo" ) { paramCount == 5 }.newInstance( VENDING_PACKAGE_NAME, - psInfo, + psSigningInfo, VENDING_PACKAGE_NAME, VENDING_PACKAGE_NAME, PackageInstaller.PACKAGE_SOURCE_STORE, ) } - private val hooks = mutableSetOf() - private var lastFilteredApp: AtomicReference = AtomicReference(null) - @Suppress("UNCHECKED_CAST") override fun load() { logI(TAG, "Load hook") @@ -101,57 +92,6 @@ class PmsHookTarget33(private val service: HMAService) : IFrameworkHook { } } - findMethodOrNull(service.pms::class.java, findSuper = true) { - name == "getInstallSourceInfo" - }?.hookBefore { param -> - val targetApp = param.args[0] as String? - - val callingUid = Binder.getCallingUid() - if (callingUid == Constants.UID_SYSTEM) return@hookBefore - val callingApps = Utils.binderLocalScope { - service.pms.getPackagesForUid(callingUid) - } ?: return@hookBefore - for (caller in callingApps) { - val blockingMode = service.shouldHideInstallationSource(caller, targetApp) - when (blockingMode) { - 1 -> param.result = fakeUserPackageInstallInfo - 2 -> param.result = fakeSystemPackageInstallInfo - else -> continue - } - - service.filterCount++ - break - } - }?.let { - hooks.add(it) - } - - hooks += findMethod(service.pms::class.java, findSuper = true) { - name == "getInstallerPackageName" - }.hookBefore { param -> - val targetApp = param.args[0] as String? - - val callingUid = Binder.getCallingUid() - if (callingUid == Constants.UID_SYSTEM) return@hookBefore - val callingApps = Utils.binderLocalScope { - service.pms.getPackagesForUid(callingUid) - } ?: return@hookBefore - for (caller in callingApps) { - val blockingMode = service.shouldHideInstallationSource(caller, targetApp) - when (blockingMode) { - 1 -> param.result = VENDING_PACKAGE_NAME - 2 -> param.result = null - else -> continue - } - - service.filterCount++ - break - } - } - } - - override fun unload() { - hooks.forEach(XC_MethodHook.Unhook::unhook) - hooks.clear() + super.load() } } diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt index 5d6f895..5e67c86 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt @@ -1,6 +1,7 @@ package icu.nullptr.hidemyapplist.xposed.hook import android.content.pm.PackageInstaller +import android.content.pm.PackageManager import android.os.Binder import android.os.Build import androidx.annotation.RequiresApi @@ -9,7 +10,6 @@ import com.github.kyuubiran.ezxhelper.utils.findMethod import com.github.kyuubiran.ezxhelper.utils.findMethodOrNull import com.github.kyuubiran.ezxhelper.utils.hookBefore import com.github.kyuubiran.ezxhelper.utils.paramCount -import de.robv.android.xposed.XC_MethodHook import icu.nullptr.hidemyapplist.common.Constants import icu.nullptr.hidemyapplist.common.Constants.VENDING_PACKAGE_NAME import icu.nullptr.hidemyapplist.common.Utils @@ -18,10 +18,9 @@ import icu.nullptr.hidemyapplist.xposed.Utils4Xposed import icu.nullptr.hidemyapplist.xposed.logD import icu.nullptr.hidemyapplist.xposed.logE import icu.nullptr.hidemyapplist.xposed.logI -import java.util.concurrent.atomic.AtomicReference @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) -class PmsHookTarget34(private val service: HMAService) : IFrameworkHook { +class PmsHookTarget34(service: HMAService) : PmsHookTargetBase(service) { companion object { private const val TAG = "PmsHookTarget34" @@ -33,7 +32,7 @@ class PmsHookTarget34(private val service: HMAService) : IFrameworkHook { } } - private val fakeSystemPackageInstallInfo by lazy { + override val fakeSystemPackageInstallInfo: Any by lazy { findConstructor( "android.content.pm.InstallSourceInfo" ) { @@ -48,21 +47,14 @@ class PmsHookTarget34(private val service: HMAService) : IFrameworkHook { ) } - private val fakeUserPackageInstallInfo by lazy { - var psInfo = Utils.getPackageInfoCompat( - service.pms, - VENDING_PACKAGE_NAME, - 0L, - 0 - ).signingInfo - + override val fakeUserPackageInstallInfo: Any by lazy { findConstructor( "android.content.pm.InstallSourceInfo" ) { paramCount == 6 }.newInstance( VENDING_PACKAGE_NAME, - psInfo, + psSigningInfo, VENDING_PACKAGE_NAME, VENDING_PACKAGE_NAME, VENDING_PACKAGE_NAME, @@ -70,9 +62,6 @@ class PmsHookTarget34(private val service: HMAService) : IFrameworkHook { ) } - private val hooks = mutableSetOf() - private var lastFilteredApp: AtomicReference = AtomicReference(null) - @Suppress("UNCHECKED_CAST") override fun load() { logI(TAG, "Load hook") @@ -132,57 +121,6 @@ class PmsHookTarget34(private val service: HMAService) : IFrameworkHook { hooks.add(it) } - findMethodOrNull(service.pms::class.java, findSuper = true) { - name == "getInstallSourceInfo" - }?.hookBefore { param -> - val targetApp = param.args[0] as String? - - val callingUid = Binder.getCallingUid() - if (callingUid == Constants.UID_SYSTEM) return@hookBefore - val callingApps = Utils.binderLocalScope { - service.pms.getPackagesForUid(callingUid) - } ?: return@hookBefore - for (caller in callingApps) { - val blockingMode = service.shouldHideInstallationSource(caller, targetApp) - when (blockingMode) { - 1 -> param.result = fakeUserPackageInstallInfo - 2 -> param.result = fakeSystemPackageInstallInfo - else -> continue - } - - service.filterCount++ - break - } - }?.let { - hooks.add(it) - } - - hooks += findMethod(service.pms::class.java, findSuper = true) { - name == "getInstallerPackageName" - }.hookBefore { param -> - val targetApp = param.args[0] as String? - - val callingUid = Binder.getCallingUid() - if (callingUid == Constants.UID_SYSTEM) return@hookBefore - val callingApps = Utils.binderLocalScope { - service.pms.getPackagesForUid(callingUid) - } ?: return@hookBefore - for (caller in callingApps) { - val blockingMode = service.shouldHideInstallationSource(caller, targetApp) - when (blockingMode) { - 1 -> param.result = VENDING_PACKAGE_NAME - 2 -> param.result = null - else -> continue - } - - service.filterCount++ - break - } - } - } - - override fun unload() { - hooks.forEach(XC_MethodHook.Unhook::unhook) - hooks.clear() + super.load() } } diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt new file mode 100644 index 0000000..49b2402 --- /dev/null +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt @@ -0,0 +1,86 @@ +package icu.nullptr.hidemyapplist.xposed.hook + +import android.content.pm.PackageManager +import android.os.Binder +import android.os.Build +import com.github.kyuubiran.ezxhelper.utils.findMethod +import com.github.kyuubiran.ezxhelper.utils.findMethodOrNull +import com.github.kyuubiran.ezxhelper.utils.hookBefore +import de.robv.android.xposed.XC_MethodHook +import icu.nullptr.hidemyapplist.common.Constants +import icu.nullptr.hidemyapplist.common.Constants.VENDING_PACKAGE_NAME +import icu.nullptr.hidemyapplist.common.Utils +import icu.nullptr.hidemyapplist.xposed.HMAService +import java.util.concurrent.atomic.AtomicReference + +abstract class PmsHookTargetBase(protected val service: HMAService) : IFrameworkHook { + protected val hooks = mutableListOf() + protected var lastFilteredApp: AtomicReference = AtomicReference(null) + + protected val psSigningInfo by lazy { + Utils.getPackageInfoCompat( + service.pms, + VENDING_PACKAGE_NAME, + PackageManager.GET_SIGNING_CERTIFICATES.toLong(), + 0 + ).signingInfo + } + + abstract val fakeSystemPackageInstallInfo: Any? + abstract val fakeUserPackageInstallInfo: Any? + + override fun load() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + findMethodOrNull(service.pms::class.java, findSuper = true) { + name == "getInstallSourceInfo" + }?.hookBefore { param -> + val targetApp = param.args[0] as String? + + val callingUid = Binder.getCallingUid() + if (callingUid == Constants.UID_SYSTEM) return@hookBefore + val callingApps = Utils.binderLocalScope { + service.pms.getPackagesForUid(callingUid) + } ?: return@hookBefore + for (caller in callingApps) { + when (service.shouldHideInstallationSource(caller, targetApp)) { + 1 -> param.result = fakeUserPackageInstallInfo + 2 -> param.result = fakeSystemPackageInstallInfo + else -> continue + } + + service.filterCount++ + break + } + }?.let { + hooks.add(it) + } + } + + hooks += findMethod(service.pms::class.java, findSuper = true) { + name == "getInstallerPackageName" + }.hookBefore { param -> + val targetApp = param.args[0] as String? + + val callingUid = Binder.getCallingUid() + if (callingUid == Constants.UID_SYSTEM) return@hookBefore + val callingApps = Utils.binderLocalScope { + service.pms.getPackagesForUid(callingUid) + } ?: return@hookBefore + for (caller in callingApps) { + when (service.shouldHideInstallationSource(caller, targetApp)) { + 1 -> param.result = VENDING_PACKAGE_NAME + 2 -> param.result = null + else -> continue + } + + service.filterCount++ + break + } + } + } + + final override fun unload() { + hooks.forEach(XC_MethodHook.Unhook::unhook) + hooks.clear() + } +} \ No newline at end of file From fc89fe78ea2f77574451d1c4a692cf140740ecb6 Mon Sep 17 00:00:00 2001 From: karigane <169052233+karigane-cha@users.noreply.github.com> Date: Tue, 9 Sep 2025 10:54:04 +0900 Subject: [PATCH 02/16] Update Japanese translation (#4) * Update ja-rJP translation * Fix minor Japanese translation --- app/src/main/res/values-ja-rJP/strings.xml | 145 ++++++++++++++------- 1 file changed, 101 insertions(+), 44 deletions(-) diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 4b5b111..2df9dc2 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1,5 +1,7 @@ + HMA-OSS + ホーム ログ 設定 @@ -8,14 +10,16 @@ アプリの管理 アプリの選択 アプリの設定 - About - Do not install HMAL to secondary user + このアプリについて + このフォークについて + + HMA をセカンダリユーザーにインストールしないでください クラッシュログの表示 - 構成ファイルが破損しています。 アプリのデータを消去してください。 + 設定ファイルが破損しています。アプリデータを削除してください リストの編集 削除 有効 - Disabled + 無効 作業モード ブラックリスト ホワイトリスト @@ -25,110 +29,158 @@ フィルター はい いいえ - Search - System + 検索 + システム + システムに従う + モジュールは有効です [%s] モジュールは無効です システムサービスの実行中 [%d] システムサービスは実行されていません - モジュールが更新されました。再起動してください。 - HMAL-OSS は合計 %d リクエストをフィルタリングしました + モジュールが更新されました。再起動してください + HMA-OSS は合計 %d 件のリクエストをフィルタリングしました 管理 検出のテスト テストアプリのダウンロード - 個別検知テストアプリを開発し、検知テストを移行しました。 今すぐダウンロードしますか？ - バックアップ & リストア - コンフィグのバックアップ - コンフィグのリストア + 個別検知テストアプリを開発し、検知テストを移行しました。今すぐダウンロードしますか？ + バックアップ & 復元 + 設定をバックアップ + 設定を復元 インポート成功 - インポートの失敗 - バックアップよりも低いモジュール バージョン + インポート失敗 + モジュールのバージョンが古すぎます バックアップのバージョンが古すぎます バックアップは破損しています 書き出しの失敗 - バックアップ済みのコンフィグ + 設定をバックアップしました 利用可能なアップデート: %s アップデート: %s + - Show system apps + システムアプリを表示 並び替え 逆順 アプリ名で パッケージネームで インストール日時で アップデート時間で + 「落ち着きのない」アプリのテンプレートを確立し、取得できるアプリリストを制御します。\n\nブラックリスト (推奨): テンプレートで選択されたアプリは、テンプレートを適用するアプリから見えなくなります。\nホワイトリスト: テンプレートで選択されていないアプリは、テンプレートを適用するアプリには表示されません。 ブラックリストのテンプレートを作成 - ホワイトリストのテンプレートの作成 + ホワイトリストのテンプレートを作成 テンプレートを削除してもよろしいですか？ テンプレート名 無効な名前 - Delete Template + テンプレートを削除 このテンプレート名は既に存在します %d 個のアプリに適用 %d 個のアプリが表示されます %d 個のアプリが表示されません + 非表示を有効にする - コンフィグのテンプレート - テンプレートのチョイス + テンプレート設定 + テンプレートを選択する + プリセットを選択する システムアプリを除外 - 本当に必要な場合にのみ、このオプションをオフにしてください。 無効にするとクラッシュする可能性があります - %d テンプレートの使用 + 本当に必要な場合にのみ、このオプションをオフにしてください。無効にするとクラッシュする可能性があります + %d 個のテンプレートを使用中 + %d 個のプリセットを使用中 + %d 個のプリセット設定を使用中 %d 個の追加アプリが表示されます %d 個の追加アプリが表示されません + 危険なパッケージ + このパッケージは危険とマークされており、非表示のアプリに問題を引き起こす可能性があります。続行しますか？ + 偽装 + インストールソースを偽装する + このアプリケーションでは、すべてのユーザーアプリが Play ストア経由でインストールされたように偽装されます + システムアプリにも偽装する + このアプリケーションでは、すべてのシステムアプリが何もインストールされていないように偽装されます + 対象アプリを除外する + このアプリが Play ストアで利用できない場合、有効にすることができます + 設定を保存した後に対象のアプリを強制終了することを忘れないでください + + + LSPosed/Xposed モジュール + Root マネージャー/Rooted アプリ + カスタム ROM アプリ + + + アクセシビリティ + 開発者向けオプション + ログの保存 ログのクリア 保存するログがありません ログを保存しました + モジュール - Data isolation - App data: %s\nVold app data: %s\nForce mount: %s - This option is only available on Android 11 and above - App data isolation - Vold app data isolation - Changing requires root permission - Changing requires reboot - Permission denied - Enforce data isolation for all apps - Data isolation is disabled for apps target API lower than 30 by default + データ分離 + アプリデータ: %s\nVold アプリデータ: %s\n強制マウント: %s + このオプションは Android 11 以上で使用できます + アプリのデータ分離 + Vold アプリのデータ分離 + 警告 + この機能は AOSP の「アプリの外部ストレージディレクトリを隔離する」という機能を有効化します。これにより、アプリの非表示機能が向上する可能性がありますが、システムの安定性に問題が生じる可能性もあります。また、この機能は AOSP で廃止されているため、いつ動作しなくなるか分からない点にも注意が必要です。 + 変更には root 権限が必要です + 変更には再起動が必要です + 権限が拒否されました + 全てのアプリに対してデータ分離を強制する + ターゲット API が 30 未満のアプリに対してはデフォルトでデータ分離が無効になっています デバッグ用詳細ログ ロガーのバッファサイズ - ランチャーでモジュール アイコンを非表示にする - Xposedマネージャーで引き続きアプリを開くことができます + ランチャーでモジュールアイコンを非表示にする + LSPosed マネージャーで引き続きアプリを開くことができます + 危険なパッケージに関する警告を無視する + この機能を有効にする前後で、危険なパッケージに関する問題が発生した場合、開発者は一切責任を負わないことをご了承ください + 言語 翻訳に参加する %s をあなたの言語に翻訳するのにご協力ください + テーマ システムのテーマカラー テーマカラー ダークテーマ ピュアブラックテーマ - ブラック有効になっている場合は、ピュアブラックのテーマを使用してください + ダークテーマが有効になっている場合、ピュアブラックテーマを使用します + サービス システムサービスを停止する サービスを再開するには再起動が必要です 実行環境のクリーンアップをしますか？ - /data/misc/hide_my_applist_* のシステム サービス キャッシュを削除します。つまり、インターセプトを有効にするには、次回の再起動後にモジュール アプリを手動で 1 回起動する必要があり、インターセプト カウントも消去されます。 - クリーンなランタイム環境を強制する(root) - システム サービスの開始に失敗した場合のみ、それ以外の場合は上記のオプションをクリックする必要があります。 - ランタイムのクリーン + /data/misc/hide_my_applist_* のシステムサービスキャッシュを削除します。つまり、インターセプトを有効にするには、次回の再起動後にモジュールアプリを手動で 1 回起動する必要があり、インターセプトカウントも消去されます。 + クリーンな実行環境を強制する (root) + システムサービスの開始に失敗した場合のみ、それ以外の場合は上記のオプションをクリックする必要があります。 + 実行環境がクリーンアップされました + アップデート アップデートの通知を無効にする ベータ版アップデートを受け取る ベータ版は不安定な場合があります + - 特定のアプリのインストールを検出するのは正しくありませんが、ルートを使用するすべてのアプリがランダムなパッケージ名のサポートを提供するわけではありません。 この場合、検出された root を使用するアプリ (Fake Location や Storage Isolation など) は、検出された root 自体と同じです。\n\n同時に、一部のスマート アプリは、さまざまな抜け穴を使用してアプリ リストを取得し、描画できるようにします。 \n\nこのモジュールは、アプリリストを適切に非表示にしているかどうかをテストする方法をいくつか提供します。 また、Xposed モジュールとして機能して、一部のアプリを非表示にしたり、アプリ リストのリクエストを拒否してプライバシーを保護したりできます。 + + 特定のアプリのインストールを検出することは正しくありませんが、root 権限を使用するすべてのアプリがランダムなパッケージ名に対応しているわけではありません。この場合、root 権限を使用しているアプリ (Fake Location や Storage Isolation など) の検出は、root 権限自体が検出されることと同等です。\n\n同時に、一部のスマートアプリは、さまざまな抜け穴を使用してアプリリストを取得して、ユーザーの行動特性を分析する場合があります。\n\nこのモジュールは、アプリリストを適切に非表示にしているかどうかを検証する方法をいくつか提供します。また、Xposed モジュールとして動作することで、特定のアプリを非表示にしたり、アプリリストの取得要求を拒否したりして、プライバシーを保護することも可能です。 + + + オリジナルの HMA プロジェクトはクローズドソースになり、最新版のコードには一部の重要な変更点が反映されていませんでした。そこで、再びオープンソースとして継続していくために、このフォーク版を作成しました。 + このモジュールの使用方法 - 「テンプレート管理」でテンプレートを作成できます。\n次に、「アプリ管理」でテンプレートをアプリに適用します。 (ターゲットに追加のアプリを選択することもできます。)\nXposed モジュール スコープ/ホワイトリストで「システム フレームワーク」をチェックする必要があります。 - リアルタイムで有効な構成変更。 - デベロッパー + + 「テンプレート管理」でテンプレートを作成できます。\n次に、「アプリ管理」でテンプレートをアプリに適用します。 (ターゲットに追加のアプリを選択することもできます。)\nXposed モジュール スコープ/ホワイトリストで「システム フレームワーク」をチェックする必要があります。 + + + 設定変更はリアルタイムで行われます。 + + 開発者 サポートとフィードバック オープンソースライセンス + 桜 レッド @@ -148,5 +200,10 @@ オレンジ ディープオレンジ ブラウン - グレーブルー + ブルーグレー + + + ダークテーマ + 常にオフ + 常にオン From cba451f01ca02b73798eb9f6dfd2cd42a393f8cb Mon Sep 17 00:00:00 2001 From: Neebe3289 Date: Tue, 9 Sep 2025 08:54:30 +0700 Subject: [PATCH 03/16] Import `Indonesian` strings.xml (#3) Change-Id: Ica5a606007c75096124eab2a16b732e82fc6b334 --- app/src/main/res/values-id-rID/strings.xml | 206 +++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100755 app/src/main/res/values-id-rID/strings.xml diff --git a/app/src/main/res/values-id-rID/strings.xml b/app/src/main/res/values-id-rID/strings.xml new file mode 100755 index 0000000..2712e48 --- /dev/null +++ b/app/src/main/res/values-id-rID/strings.xml @@ -0,0 +1,206 @@ + + + Beranda + Log + Pengaturan + Kelola templat + Pengaturan templat + Kelola aplikasi + Pilih aplikasi + Pengaturan aplikasi + Tentang + Tentang fork ini + Jangan instal HMA pada pengguna sekunder + Tampilkan log kerusakan + File konfigurasi rusak. Harap bersihkan data aplikasi + Edit daftar + Menghapus + Diaktifkan + Dinonaktifkan + Mode kerja + Blacklist + Whitelist + Aplikasi + Preferensi + Segarkan + Filter + Ya + Tidak + Cari + Sistem + Mengikuti sistem + + + Modul Diaktifkan [%s] + Modul Tidak Diaktifkan + Layanan sistem sedang berjalan [%d] + Layanan sistem tidak berjalan + Modul diperbarui, perlu di-boot ulang + HMA-OSS telah memfilter total %d permintaan + Kelola + Uji deteksi + Unduh aplikasi uji + Kami telah mengembangkan aplikasi uji deteksi individual dan memigrasikan uji deteksi ke dalamnya. Ingin mengunduhnya sekarang? + Cadangan & Pemulihan + Konfigurasi cadangan + Konfigurasi pemulihan + Impor berhasil + Impor gagal + Versi modul lebih rendah dari versi cadangan + Versi cadangan terlalu lama + File cadangan rusak + Ekspor gagal + Konfigurasi yang dicadangkan + Pembaruan baru tersedia: %s + Memperbarui: %s + + + Tampilkan aplikasi sistem + Urutkan + Urutkan terbalik + Nama aplikasi + Nama paket + Waktu instalasi + Waktu pembaruan + + + Buat templat untuk aplikasi \"restless\", guna mengontrol akses daftar aplikasi.\n\nBlacklist (disarankan): aplikasi yang dipilih dalam templat akan tersembunyi dari aplikasi yang menerapkan templat tersebut.\nWhitelist: aplikasi yang tidak dipilih dalam templat akan tersembunyi oleh aplikasi yang menerapkan templat tersebut. + Buat templat blacklist + Buat templat whitelist + Apakah anda yakin ingin menghapus templat tersebut? + Nama templat + Nama tidak valid + Hapus Templat + Nama templat sudah ada + Diterapkan ke %d aplikasi + %d apl terlihat + %d apl tidak terlihat + + + Aktifkan penyembunyian + Konfigurasi templat + Pilih templat + Pilih preset + Kecualikan aplikasi sistem + Matikan opsi ini hanya jika benar-benar diperlukan. Kemungkinan menyebabkan crash jika dinonaktifkan + Menggunakan %d templat + Menggunakan %d preset + Menggunakan %d preset pengaturan + %d apl tambahan terlihat + %d apl tambahan tidak terlihat + Paket berisiko + Paket ini ditandai sebagai berisiko dan dapat menyebabkan masalah pada aplikasi tersembunyi. Apakah anda ingin melanjutkan? + Spoofing + Sumber instalasi spoof + Semua aplikasi pengguna akan di-spoof seolah-olah terpasang di Play Store untuk aplikasi ini + Spoof apl sistem juga + Semua aplikasi sistem akan di-spoof seolah-olah terpasang tanpa alasan apa pun untuk aplikasi ini + Kecualikan aplikasi target + Anda dapat mengaktifkannya jika aplikasi ini tidak tersedia di Play Store + Jangan lupa untuk menghentikan paksa aplikasi target setelah menyimpan konfigurasi + + + Modul LSPosed/Xposed + Manajer root/Aplikasi root + Aplikasi ROM kustom + + + Aksesibilitas + Opsi pengembang + + + Simpan log + Hapus log + Tidak ada log tersimpan + Log disimpan + + + Modul + Isolasi data + Data apl: %s\nData apl Vold: %s\nPaksa mount: %s + Opsi ini hanya tersedia di Android 11 dan di atasnya + Isolasi data aplikasi + Isolasi data aplikasi Vold + Peringatan + Ini akan mengaktifkan fitur AOSP yang membuat direktori penyimpanan pribadi eksternal aplikasi terisolasi. Ini dapat membantu meningkatkan penyembunyian aplikasi meskipun dapat menyebabkan masalah stabilitas. Fitur ini dapat berhenti berfungsi kapan saja karena ditinggalkan oleh AOSP. + Perubahan diperlukan izin root + Perubahan diperlukan reboot + Izin ditolak + Paksa isolasi data untuk semua aplikasi + Isolasi data dinonaktifkan untuk aplikasi target API yang lebih rendah dari 30 secara default + Log detail untuk debugging + Ukuran buffer logger + Sembunyikan ikon modul di launcher + Anda masih dapat membuka aplikasi di manajer Xposed + Lewati peringatan paket berisiko + Perlu diketahui bahwa pengembang tidak bertanggung jawab atas masalah terkait paket berisiko sebelum atau setelah anda mengaktifkan fitur ini + + Bahasa + Berpartisipasi dalam penerjemahan + Bantu kami menerjemahkan %s ke bahasa anda + + Tema + Warna tema sistem + Warna tema + Tema gelap + Tema gelap hitam murni + Gunakan tema hitam murni jika tema gelap diaktifkan + + Layanan + Hentikan layanan sistem + Perlu reboot untuk memulai kembali layanan + Bersihkan lingkungan runtime pada saat yang bersamaan? + Hapus cache layanan sistem di /data/misc/hide_my_applist_*. Setelah reboot berikutnya, Diperlukan membuka aplikasi modul sekali secara manual untuk mengaktifkan intersepsi, dan jumlah intersepsi juga akan dihapus. + Paksa bersihkan lingkungan runtime (root) + Hanya jika layanan sistem gagal untuk memulai, jika tidak, Anda harus mengklik opsi di atas. + Lingkungan runtime dibersihkan + + Pembaruan + Nonaktifkan pemberitahuan pembaruan + Terima pembaruan beta + Versi beta mungkin tidak stabil + + + + Meskipun tidak tepat untuk mendeteksi instalasi aplikasi tertentu, tidak semua aplikasi yang menggunakan root mendukung nama paket acak. Dalam kasus ini, aplikasi terdeteksi yang menggunakan root (seperti Lokasi Palsu dan Isolasi Penyimpanan) dianggap sama dengan root itu sendiri.\n\nPada saat yang sama, beberapa aplikasi cerdas memanfaatkan celah untuk mendapatkan daftar aplikasi anda, sehingga mereka bisa membangun profil tentang anda.\n\nModul ini menyediakan beberapa metode untuk menguji apakah anda telah menyembunyikan daftar aplikasi dengan baik. Selain itu, dapat berfungsi sebagai modul Xposed untuk menyembunyikan aplikasi tertentu atau menolak permintaan daftar aplikasi guna melindungi privasi anda. + + + Proyek HMA asli telah menjadi sumber tertutup dan kode terbaru mereka tidak memuat beberapa perubahan terbaru, jadi saya membuat percabangan ini untuk melanjutkannya sebagai sumber terbuka lagi. + + Cara menggunakan modul ini + + Anda dapat membuat template di \"Kelola templat\".\nKemudian terapkan templat ke aplikasi di \"Kelola aplikasi\". (Anda juga dapat memilih aplikasi tambahan untuk target.)\nAnda harus dan HANYA memeriksa \"Kerangka Sistem\" dalam scope modul Xposed / whitelist. + + + Modifikasi konfigurasi efektif secara real time. + + Pengembang + Dukungan dan umpan balik + Lisensi sumber terbuka + + + Sakura + Merah + Merah muda + Ungu + Ungu tua + Biru nila + Biru + Biru muda + Sian + Toska + Hijau + Hijau muda + Hijau limau + Kuning + Kuning amber + Oranye + Oranye tua + Cokelat + Biru abu + + + Tema gelap + Selalu mati + Selalu aktif + From cb55dea35b393bf6d7edcab47237f18b5040584b Mon Sep 17 00:00:00 2001 From: DanGLES3 Date: Mon, 8 Sep 2025 22:54:57 -0300 Subject: [PATCH 04/16] Proper PT-BR (Brazilian Portuguese) translation (#2) --- app/src/main/res/values-pt-rBR/strings.xml | 233 ++++++++++++--------- 1 file changed, 129 insertions(+), 104 deletions(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 06ac949..3072e42 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -3,52 +3,54 @@ Início Registros Configurações - Gerenciador de modelo - Configurações de modelos - Gerenciador de aplicativos + Gerenciar modelos + Configurações do modelo + Gerenciar apps Selecionar aplicativo Configurações do aplicativo Sobre - Não instale HMAL no usuário secundário - Mostrar registro do crash + Sobre essa versão + Não instale HMA no usuário secundário + Mostrar registro do erro Arquivo de configuração danificado. Por favor limpe os dados do aplicativo Editar lista Deletar - Ligado - Disabled - Modo de trabalho - Lista negra - Lista branca - Aplicação - Preferencias + Habilitado + Desabilitado + Modo de funcionamento + Lista Negra + Lista Branca + Aplicativo + Configurações Recarregar Filtro Sim Não Pesquisar - System + Sistema + Seguir o sistema Módulo ativado [%s] Módulo não ativado Serviço do sistema funcionando [%d] Serviço do sistema não está funcionando - Módulo atualizado, precisa reiniciar - HMAL-OSS foi filtrado total %d requisitos + Módulo atualizado, necessário reiniciar + HMA-OSS filtrou no total %d de pedidos Gerenciar Teste de detecção Baixar aplicativo de teste Desenvolvemos um aplicativo de teste de detecção individual e migramos o teste de detecção para ele. Deseja baixá-lo agora? - Cópia de segurança & Restaurar - Configurações da cópia de segurança - Configurações de restauração + Backup & Restaurar + Backup das configurações + Restaurar backup Importado com sucesso Erro ao importar - Versão do módulo inferior a copia de segurança - Versão da cópia de segurança muito velho - Arquivo da cópia de segurança foi danificado + Versão do módulo inferior ao backup + Versão do backup é muito antiga + Arquivo de backup esta danificado Erro ao exportar - Configuração salvada - Nova atualização acessível: %s + Configuração salva + Nova atualização disponivel: %s Atualização: %s Mostrar apps do sistema @@ -59,97 +61,120 @@ Pela data de instalação Pela data de atualização - Establish templates for \"restless\" apps, controlling applist they can obtain.\n\nBlacklist (recommended): the apps selected in the template will be invisible to the apps applying the template.\nWhitelist: the apps not selected in the template will be invisible to the apps applying the template. - Create a blacklist template - Create a whitelist template - Are you sure to delete the template? - Template name - Name invalid - Delete Template - Template name already exist - Applied to %d apps - %d apps visible - %d apps invisible + Estabalecer modelos para apps \"inquietos\", controlando a lista de aplicativos que eles podem obter.\n\nLista Negra (recomendado): Os apps selecionados no modelo seram invisiveis para os apps no qual esse modelo for aplicado.\nLista Branca: Os apps não selecionados nesse modelo serão invisiveis aos apps no qual esse modelo for aplicado + Criar modelo de lista negra + Criar modelo de lista branca + Tem certeza que quer apagar a configuração + Nome do modelo + Nome inválido + Apagar modelo + Nome de modelo ja existe + "Aplicado a %d aplicativos " + %d aplicativos visiveis + %d aplicativos invisiveis - Enable hide - Template config - Choose template - Exclude system apps - Turn off this option only when really necessary. It is likely to cause crash with it disabled - Using %d templates - %d additional apps visible - %d additional apps invisible + "Ativar escondimento " + Configurações do modelo + Escolher modelo + Escolher perfil + Excluir apps dos sistema + Desative essa opção somente quando REALMENTE necessário, ja que pode ocasionar do app parar de funcionar se desativado + Usando %d modelos + Usando %d perfis de configuração + %d apps adicionais expostos + %d apps adicionais escondidos - Save logs - Clear logs - No logs to save - Logs saved + Opções de desenvolvedor + Salvar registros + Limpar registros + Sem registros pra salvar + Registros salvos - Module - Data isolation - App data: %s\nVold app data: %s\nForce mount: %s - This option is only available on Android 11 and above + Modulo + Isolamento de dados + App data: %s\nVold app data: %s\nForçar montagem: %s + Esta opção só esta disponivel no Android 11 pra cima App data isolation Vold app data isolation - Changing requires root permission - Changing requires reboot - Permission denied - Enforce data isolation for all apps - Data isolation is disabled for apps target API lower than 30 by default - Detail log for debugging - Logger buffer sizes - Hide module icon in launcher - You can still open the app in Xposed manager - Language - Participate in translation - Help us translate %s into your language - Theme - System theme color - Theme color - Dark theme - Pure black dark theme - Use the pure black theme if dark theme is enabled - Service - Stop system service - Need reboot to restart service - Limpar o ambiente do runtime ao mesmo tempo? - Remover arquivo temporário do serviço do sistema em /data/misc/hide_my_applist_*. Isso significa que você precisa iniciar o aplicativo de módulos uma vez manualmente no próximo reinício para habilitar interceptações, e a contagens de interceptações será apagada. - Forçar a limpar o ambiente do runtime (root) - Apenas se o serviço de sistema falhar ao iniciar, por outro lado, você deve clicar acima da opção. - Ambiente do runtime limpado - Atualize - Desabilitar notificações de atualizações + Isso ira ativar um recurso do Android que isola as pastas externas de aplicativos. Isso pode ajudar a melhor esconder apps mas pode causar instabilidade. Esse recurso pode parar de funcionar a qualquer momento ja que esta abandonada no Android. + Alterar requer permissão d root + Alterar requer reinicialização + Permissão negada + Impor isolamento de dados em todos os apps + Isolamento de dados esta desativado para apps q usam API inferior a 30 por padrão + Registros detalhados para depuração + Tamanho do registro + Esconder icone do modulo no launcher + Voce ainda podera abrir o app pelo Lsposed + Nota que o desenvolvedor não é responsavel por problemas causados por apps de risco antes ou depois de voce ativar esse recurso + Idioma + Participe na tradução + Nos ajude a traduzir %s na sua lingua + Tema + Cor de tema do sistema + Cor do tema + Tema escuro + Tema puramente preto + Usar o tema puramente preto se o tema escuro estivar habilitado + Serviço + Parar serviço do sistema + Reinicialização necessario para reiniciar o serviço + Limpar o ambiente de operação ao mesmo tempo? + Remover arquivo temporário do serviço do sistema em /data/misc/hide_my_applist_*. Isso significa que você precisa iniciar o aplicativo manualmente uma vez na próxima reinicialização para habilitar interceptações, e a contagens de interceptações será apagada. + Forçar a limpar o ambiente de operações (root) + Apenas se o serviço de sistema falhar ao iniciar, se não voce deve clicar a opção acima. + Ambiente de operação limpo + Atualizar + Desativar notificações de atualizações Receber atualizações beta A versão beta pode ser instável Although It is incorrect to detect specific app installation, yet not every app using root provides random package name support. In this case, detected apps that use root (such as Fake Location and Storage Isolation) is equal to detected root itself.\n\nAt the same time, some smart apps use various loopholes to acquire your app list, so that it can draw a persona for you.\n\nThis module provides some methods to test whether you have already hidden your applist nicely. Also, it can work as an Xposed module to hide some apps or reject app list requests to protect your privacy. - How to use this module - You can create templates in \"Template manage\".\nThen apply the templates to apps in \"App manage\". (You can also select extra apps for targets.)\nYou should and ONLY should check \"System Framework\" in Xposed module scope / whitelist. - - Config modification effective in real time. - - Developer - Support and feedback - Open source licenses + Como usar esse modulo + " Voce pode criar modelos em \"Gerenciar modelos\".\nEntão aplique os modelos nos apps em \"Gerenciar app\". (Voce tamber pode selecionar apps extra para esconder de tais.)\nVoce só deve habilitar o \"Sistema Android\" na lista de ativação do Xposed.\n " + " A modificação de configurações tem efeito imediato.\n " + Desenvolvedor + Suporte e ajuda + Licensas de codigo aberto Sakura - Red - Pink - Purple - Deep purple - Indigo - Blue - Light blue - Cyan - Teal - Green - Light green - Lime - Yellow - Amber - Orange - Deep orange - Brown - Blue grey + Vermelho + Rosa + Roxo + Roxo Intenso + Aníl + Azul + Azul Claro + Ciano + Verde-Azulado + Verde + Verde Claro + Lima + Amarelo + Ãmbar + Laranja + Laranaja Intenso + Marrom + Azul Acinzentado + Usando %d perfis + Aplicativo de risco + Esse aplicativo foi marcado como de risco e pode ocasionar em problemas se escondidos dos apps. Deseja continuar? + Esconder + Esconder fontes de instalação + Todos os apps de usuário serão marcados como instalados a partir da Play Store para esse aplicativo + Esconder apps de sistema tambem + Todos os apps de sistema serão marcados como instalados pelo nada para esse applicativo + Ignorar este app + Ative isso se esse app não esta disponivel na Play Store + Não esqueça de fechar o app após salvar a configuração + Modulos Lsposed/Xposed + Gerenciadores de root/Apps de root + Apps de ROM modificado + "Acessibilidade " + Aviso + Ignorar aviso de app de risco + Tema escuro + Sempre desligado + Sempre ligado From 7f21297ac9a532520c660723163a865abc59fc9a Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Tue, 9 Sep 2025 05:37:32 +0300 Subject: [PATCH 05/16] Revert channel message template to old one, improve multi-user support (WIP) --- .../icu/nullptr/hidemyapplist/xposed/HMAService.kt | 9 +++++---- .../hidemyapplist/xposed/hook/PmsHookTargetBase.kt | 12 +++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt index 1b61cae..9777bf0 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.content.pm.ApplicationInfo import android.content.pm.IPackageManager import android.os.Build +import android.os.UserHandle import icu.nullptr.hidemyapplist.common.AppPresets import icu.nullptr.hidemyapplist.common.Constants import icu.nullptr.hidemyapplist.common.IHMAService @@ -192,7 +193,7 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() { return appConfig.useWhitelist } - fun shouldHideInstallationSource(caller: String?, query: String?): Int { + fun shouldHideInstallationSource(caller: String?, query: String?, user: UserHandle): Int { if (caller == null || query == null) return 0 val appConfig = config.scope[caller] ?: return 0 if (!appConfig.hideInstallationSource) return 0 @@ -200,11 +201,11 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() { if (caller == query && appConfig.excludeTargetInstallationSource) return 0 try { - val uid = Utils.getPackageUidCompat(pms, query, 0L, 0) - logD(TAG, "@shouldHideInstallationSource UID for $caller -> $query: $uid") + val uid = Utils.getPackageUidCompat(pms, query, 0L, user.hashCode()) + logD(TAG, "@shouldHideInstallationSource UID for $caller (${user.hashCode()}) -> $query: $uid") if (uid < 0) return 0 // invalid package installation source request } catch (e: Throwable) { - logD(TAG, "@shouldHideInstallationSource UID error", e) + logD(TAG, "@shouldHideInstallationSource UID error for $caller (${user.hashCode()})", e) return 0 } diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt index 49b2402..b04c5fb 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTargetBase.kt @@ -34,15 +34,16 @@ abstract class PmsHookTargetBase(protected val service: HMAService) : IFramework findMethodOrNull(service.pms::class.java, findSuper = true) { name == "getInstallSourceInfo" }?.hookBefore { param -> - val targetApp = param.args[0] as String? + val query = param.args[0] as String? + val user = Binder.getCallingUserHandle() val callingUid = Binder.getCallingUid() if (callingUid == Constants.UID_SYSTEM) return@hookBefore val callingApps = Utils.binderLocalScope { service.pms.getPackagesForUid(callingUid) } ?: return@hookBefore for (caller in callingApps) { - when (service.shouldHideInstallationSource(caller, targetApp)) { + when (service.shouldHideInstallationSource(caller, query, user)) { 1 -> param.result = fakeUserPackageInstallInfo 2 -> param.result = fakeSystemPackageInstallInfo else -> continue @@ -59,15 +60,16 @@ abstract class PmsHookTargetBase(protected val service: HMAService) : IFramework hooks += findMethod(service.pms::class.java, findSuper = true) { name == "getInstallerPackageName" }.hookBefore { param -> - val targetApp = param.args[0] as String? + val query = param.args[0] as String? + val user = Binder.getCallingUserHandle() val callingUid = Binder.getCallingUid() if (callingUid == Constants.UID_SYSTEM) return@hookBefore val callingApps = Utils.binderLocalScope { service.pms.getPackagesForUid(callingUid) } ?: return@hookBefore for (caller in callingApps) { - when (service.shouldHideInstallationSource(caller, targetApp)) { + when (service.shouldHideInstallationSource(caller, query, user)) { 1 -> param.result = VENDING_PACKAGE_NAME 2 -> param.result = null else -> continue @@ -83,4 +85,4 @@ abstract class PmsHookTargetBase(protected val service: HMAService) : IFramework hooks.forEach(XC_MethodHook.Unhook::unhook) hooks.clear() } -} \ No newline at end of file +} From 2302c77782054c64e4116d23d5f4731aec1fe3a5 Mon Sep 17 00:00:00 2001 From: idyll Date: Tue, 9 Sep 2025 12:42:29 +0800 Subject: [PATCH 06/16] Update Chinese translation (#5) Chinese translation --- app/src/main/res/values-zh-rCN/strings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0428265..b662ed1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -77,8 +77,18 @@ 排除系统应用 仅在必需时关闭此选项。禁用它很可能会导致崩溃 已启用 %d 个模板 + 使用 %d 预置 + 使用 %d 设置预置 %d 个额外可见的应用 %d 个额外不可见的应用 + 欺骗 + 欺骗安装源 + 用户的所有应用程序都会被伪装成已在 Play Store 上安装了此应用程序 + 欺骗系统应用程序 + 所有系统应用程序都会被伪装成已安装，而非此应用程序 + 排除目标应用 + 如果 Play Store 中没有此应用程序，您可以启用它 + 保存配置后强制停止目标应用程序 保存日志 清除日志 @@ -111,6 +121,8 @@ 深色主题 纯黑主题 当深色主题启用时使用纯黑主题 + 绕过风险软件包警告 + 请注意，对于启用此功能之前或之后出现的与风险软件包相关的问题，开发人员概不负责 服务 停止系统服务 需要重启设备才能再次启动系统服务 From add8a2392c68304df2c747c9a75aaf0c7bdee0ae Mon Sep 17 00:00:00 2001 From: Neebe3289 Date: Wed, 10 Sep 2025 00:18:19 +0700 Subject: [PATCH 07/16] Reflect indonesian translation changes (#7) Change-Id: I9b00f45213e37169188aa25be8145840afcd5769 --- .../strings.xml | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) rename app/src/main/res/{values-id-rID => values-in-rID}/strings.xml (89%) mode change 100755 => 100644 diff --git a/app/src/main/res/values-id-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml old mode 100755 new mode 100644 similarity index 89% rename from app/src/main/res/values-id-rID/strings.xml rename to app/src/main/res/values-in-rID/strings.xml index 2712e48..a67aa14 --- a/app/src/main/res/values-id-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -28,20 +28,19 @@ Tidak Cari Sistem - Mengikuti sistem - + Ikut sistem Modul Diaktifkan [%s] Modul Tidak Diaktifkan Layanan sistem sedang berjalan [%d] Layanan sistem tidak berjalan - Modul diperbarui, perlu di-boot ulang + Modul diperbarui, perlu mulai ulang HMA-OSS telah memfilter total %d permintaan Kelola Uji deteksi Unduh aplikasi uji Kami telah mengembangkan aplikasi uji deteksi individual dan memigrasikan uji deteksi ke dalamnya. Ingin mengunduhnya sekarang? - Cadangan & Pemulihan + Cadangkan & Pulihkan Konfigurasi cadangan Konfigurasi pemulihan Impor berhasil @@ -53,7 +52,6 @@ Konfigurasi yang dicadangkan Pembaruan baru tersedia: %s Memperbarui: %s - Tampilkan aplikasi sistem Urutkan @@ -62,7 +60,6 @@ Nama paket Waktu instalasi Waktu pembaruan - Buat templat untuk aplikasi \"restless\", guna mengontrol akses daftar aplikasi.\n\nBlacklist (disarankan): aplikasi yang dipilih dalam templat akan tersembunyi dari aplikasi yang menerapkan templat tersebut.\nWhitelist: aplikasi yang tidak dipilih dalam templat akan tersembunyi oleh aplikasi yang menerapkan templat tersebut. Buat templat blacklist @@ -75,7 +72,6 @@ Diterapkan ke %d aplikasi %d apl terlihat %d apl tidak terlihat - Aktifkan penyembunyian Konfigurasi templat @@ -98,22 +94,18 @@ Kecualikan aplikasi target Anda dapat mengaktifkannya jika aplikasi ini tidak tersedia di Play Store Jangan lupa untuk menghentikan paksa aplikasi target setelah menyimpan konfigurasi - Modul LSPosed/Xposed Manajer root/Aplikasi root Aplikasi ROM kustom - Aksesibilitas Opsi pengembang - Simpan log Hapus log Tidak ada log tersimpan Log disimpan - Modul Isolasi data @@ -134,18 +126,15 @@ Anda masih dapat membuka aplikasi di manajer Xposed Lewati peringatan paket berisiko Perlu diketahui bahwa pengembang tidak bertanggung jawab atas masalah terkait paket berisiko sebelum atau setelah anda mengaktifkan fitur ini - Bahasa Berpartisipasi dalam penerjemahan Bantu kami menerjemahkan %s ke bahasa anda - Tema Warna tema sistem Warna tema Tema gelap Tema gelap hitam murni Gunakan tema hitam murni jika tema gelap diaktifkan - Layanan Hentikan layanan sistem Perlu reboot untuk memulai kembali layanan @@ -154,30 +143,23 @@ Paksa bersihkan lingkungan runtime (root) Hanya jika layanan sistem gagal untuk memulai, jika tidak, Anda harus mengklik opsi di atas. Lingkungan runtime dibersihkan - Pembaruan Nonaktifkan pemberitahuan pembaruan Terima pembaruan beta Versi beta mungkin tidak stabil - - - Meskipun tidak tepat untuk mendeteksi instalasi aplikasi tertentu, tidak semua aplikasi yang menggunakan root mendukung nama paket acak. Dalam kasus ini, aplikasi terdeteksi yang menggunakan root (seperti Lokasi Palsu dan Isolasi Penyimpanan) dianggap sama dengan root itu sendiri.\n\nPada saat yang sama, beberapa aplikasi cerdas memanfaatkan celah untuk mendapatkan daftar aplikasi anda, sehingga mereka bisa membangun profil tentang anda.\n\nModul ini menyediakan beberapa metode untuk menguji apakah anda telah menyembunyikan daftar aplikasi dengan baik. Selain itu, dapat berfungsi sebagai modul Xposed untuk menyembunyikan aplikasi tertentu atau menolak permintaan daftar aplikasi guna melindungi privasi anda. + Meskipun tidak tepat untuk mendeteksi instalasi aplikasi tertentu, tidak semua aplikasi yang menggunakan root mendukung nama paket acak. Dalam kasus ini, aplikasi terdeteksi yang menggunakan root (seperti Lokasi Palsu dan Isolasi Penyimpanan) dianggap sama dengan root itu sendiri.\n\nPada saat yang sama, beberapa aplikasi cerdas memanfaatkan celah untuk mendapatkan daftar aplikasi anda, sehingga mereka bisa membangun profil tentang anda.\n\nModul ini menyediakan beberapa metode untuk menguji apakah anda telah menyembunyikan daftar aplikasi dengan baik. Selain itu, dapat berfungsi sebagai modul Xposed untuk menyembunyikan aplikasi tertentu atau menolak permintaan daftar aplikasi guna melindungi privasi anda. - - Proyek HMA asli telah menjadi sumber tertutup dan kode terbaru mereka tidak memuat beberapa perubahan terbaru, jadi saya membuat percabangan ini untuk melanjutkannya sebagai sumber terbuka lagi. + Proyek HMA asli telah menjadi sumber tertutup dan kode terbaru mereka tidak memuat beberapa perubahan terbaru, jadi saya membuat percabangan ini untuk melanjutkannya sebagai sumber terbuka lagi. Cara menggunakan modul ini - - Anda dapat membuat template di \"Kelola templat\".\nKemudian terapkan templat ke aplikasi di \"Kelola aplikasi\". (Anda juga dapat memilih aplikasi tambahan untuk target.)\nAnda harus dan HANYA memeriksa \"Kerangka Sistem\" dalam scope modul Xposed / whitelist. + Anda dapat membuat template di \"Kelola templat\".\nKemudian terapkan templat ke aplikasi di \"Kelola aplikasi\". (Anda juga dapat memilih aplikasi tambahan untuk target.)\nAnda harus dan HANYA memeriksa \"Kerangka Sistem\" dalam scope modul Xposed / whitelist. - - Modifikasi konfigurasi efektif secara real time. + Modifikasi konfigurasi efektif secara real time. Pengembang Dukungan dan umpan balik Lisensi sumber terbuka - Sakura Merah @@ -198,7 +180,6 @@ Oranye tua Cokelat Biru abu - Tema gelap Selalu mati From 0b5935328e33ae464c8b7e99bd53879c13a45ee9 Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Wed, 10 Sep 2025 06:03:56 +0300 Subject: [PATCH 08/16] Fix crash after editing uninstalled app config, update translations --- .../icu/nullptr/hidemyapplist/ui/view/AppItemView.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt index 48e2af7..742dcc5 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt @@ -35,7 +35,12 @@ class AppItemView @JvmOverloads constructor( fun load(packageName: String) { binding.packageName.text = packageName - binding.label.text = PackageHelper.loadAppLabel(packageName) - binding.icon.setImageBitmap(PackageHelper.loadAppIcon(packageName)) + try { + binding.label.text = PackageHelper.loadAppLabel(packageName) + binding.icon.setImageBitmap(PackageHelper.loadAppIcon(packageName)) + } catch (e: Throwable) { + binding.label.text = packageName + binding.icon.setImageResource(android.R.drawable.sym_def_app_icon) + } } } From 11fc2fc2063f9b1a6fb0b534e465ab0b14792de3 Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Wed, 10 Sep 2025 07:13:08 +0300 Subject: [PATCH 09/16] Prevent adding HMA-OSS to the scope, show info text in list the when app/scope list is empty, add working mode indicator to template settings --- .../ui/adapter/AppSelectAdapter.kt | 7 +++- .../ui/fragment/AppSelectFragment.kt | 38 +++++++++++++++++++ .../ui/fragment/TemplateSettingsFragment.kt | 1 + .../main/res/layout/fragment_app_select.xml | 25 ++++++++++++ .../res/layout/fragment_template_settings.xml | 22 +++++++++++ app/src/main/res/values/strings.xml | 2 + 6 files changed, 93 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppSelectAdapter.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppSelectAdapter.kt index 3474bc5..ebd5746 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppSelectAdapter.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppSelectAdapter.kt @@ -8,6 +8,7 @@ import icu.nullptr.hidemyapplist.ui.view.AppItemView import icu.nullptr.hidemyapplist.util.PackageHelper import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking +import org.frknkrc44.hma_oss.BuildConfig abstract class AppSelectAdapter( private val firstFilter: ((String) -> Boolean)? = null @@ -24,9 +25,11 @@ abstract class AppSelectAdapter( val filteredList = PackageHelper.appList.first().filter { if (firstFilter?.invoke(it) == false) return@filter false if (!PrefManager.appFilter_showSystem && PackageHelper.isSystem(it)) return@filter false + if (it == BuildConfig.APPLICATION_ID && + (this@AppSelectAdapter.javaClass == AppManageAdapter::class.java || + (this@AppSelectAdapter.javaClass == AppScopeAdapter::class.java && firstFilter != null))) return@filter false val label = PackageHelper.loadAppLabel(it) - val packageInfo = PackageHelper.loadPackageInfo(it) - label.lowercase().contains(constraintLowered) || packageInfo.packageName.lowercase().contains(constraintLowered) + label.lowercase().contains(constraintLowered) || it.lowercase().contains(constraintLowered) } FilterResults().also { it.values = filteredList } diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt index 965a3d1..4f3845d 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt @@ -4,13 +4,16 @@ import android.os.Build import android.os.Bundle import android.view.MenuItem import android.view.View +import android.view.ViewGroup import android.view.WindowInsets +import android.widget.TextView import androidx.activity.addCallback import androidx.appcompat.widget.SearchView import androidx.fragment.app.Fragment import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import by.kirich1409.viewbindingdelegate.viewBinding import icu.nullptr.hidemyapplist.service.PrefManager import icu.nullptr.hidemyapplist.ui.adapter.AppSelectAdapter @@ -113,6 +116,13 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { PackageHelper.invalidateCache() } + adapter.registerAdapterDataObserver( + EmptyDataObserver( + binding.list, + binding.listEmptyContainer + ) + ) + lifecycleScope.launch { PackageHelper.isRefreshing .flowWithLifecycle(lifecycle) @@ -145,4 +155,32 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { insets } } + + // Credit: https://medium.com/nerd-for-tech/empty-dataset-in-recyclerview-ad86833dd5c6 + inner class EmptyDataObserver( + private val recyclerView: RecyclerView, + private val emptyView: View + ): RecyclerView.AdapterDataObserver() { + private val isScopeFragment = this@AppSelectFragment.javaClass == ScopeFragment::class.java + + private fun checkIfEmpty() { + val emptyViewVisible = recyclerView.adapter!!.itemCount < if (isScopeFragment) 1 else 2 + emptyView.visibility = if (emptyViewVisible) View.VISIBLE else View.GONE + if (emptyViewVisible) { + emptyView.findViewById(R.id.list_empty_text).text = getString( + if (isScopeFragment) { + R.string.list_empty_no_enabled + } else { + R.string.list_empty_no_apps + } + ) + } + (recyclerView.parent as View).visibility = if (emptyViewVisible) View.GONE else View.VISIBLE + } + + override fun onChanged() { + super.onChanged() + checkIfEmpty() + } + } } diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt index 3e43580..1735ce6 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt @@ -80,6 +80,7 @@ class TemplateSettingsFragment : Fragment(R.layout.fragment_template_settings) { ) binding.templateName.setText(viewModel.name) + binding.workMode.setText(if (viewModel.isWhiteList) R.string.whitelist else R.string.blacklist) binding.templateName.addTextChangedListener { viewModel.name = it.toString() } binding.targetApps.setOnClickListener { setFragmentResultListener("app_select") { _, bundle -> diff --git a/app/src/main/res/layout/fragment_app_select.xml b/app/src/main/res/layout/fragment_app_select.xml index 75b2aa2..66696a6 100644 --- a/app/src/main/res/layout/fragment_app_select.xml +++ b/app/src/main/res/layout/fragment_app_select.xml @@ -37,5 +37,30 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + + + + + + + diff --git a/app/src/main/res/layout/fragment_template_settings.xml b/app/src/main/res/layout/fragment_template_settings.xml index 8be7422..729eed5 100644 --- a/app/src/main/res/layout/fragment_template_settings.xml +++ b/app/src/main/res/layout/fragment_template_settings.xml @@ -39,6 +39,28 @@ android:layout_height="wrap_content" /> + + + + + + + By package name By install time By update time + Try enabling hiding for apps with this template\'s work mode and apps will appear here + No applications found, maybe you didn\'t allow this app to query all packages Establish templates for \"restless\" apps, controlling applist they can obtain.\n\nBlacklist (recommended): the apps selected in the template will be invisible to the apps applying the template.\nWhitelist: the apps not selected in the template will be invisible to the apps applying the template. From b51a3f695eb35934725b5b17695914c7e862df9c Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Thu, 11 Sep 2025 03:46:37 +0300 Subject: [PATCH 10/16] Add "Show presets" option, fix backup/restore config buttons, update translations --- .../hidemyapplist/service/ConfigManager.kt | 1 + .../hidemyapplist/service/ServiceClient.kt | 3 + .../ui/fragment/AppSelectFragment.kt | 28 ++++--- .../ui/fragment/TemplateManageFragment.kt | 4 +- .../hidemyapplist/util/PackageHelper.kt | 36 ++++++--- .../hma_oss/ui/adapter/AppPresetAdapter.kt | 58 ++++++++++++++ .../ui/adapter/AppPresetListAdapter.kt | 75 +++++++++++++++++++ .../hma_oss/ui/fragment/AppPresetFragment.kt | 50 +++++++++++++ .../hma_oss/ui/fragment/HomeFragment.kt | 8 ++ .../ui/fragment/PresetManageFragment.kt | 73 ++++++++++++++++++ app/src/main/res/layout/fragment_home.xml | 8 ++ .../res/layout/fragment_preset_manage.xml | 32 ++++++++ .../main/res/navigation/home_nav_graph.xml | 14 ++++ app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 4 +- .../hidemyapplist/common/IHMAService.aidl | 2 + .../common/app_presets/BasePreset.kt | 2 + gradle/libs.versions.toml | 3 +- .../hidemyapplist/xposed/HMAService.kt | 3 + .../hidemyapplist/xposed/XposedEntry.kt | 3 - .../xposed/hook/PmsHookTarget28.kt | 4 - .../xposed/hook/PmsHookTarget30.kt | 1 - .../xposed/hook/PmsHookTarget33.kt | 5 -- .../xposed/hook/PmsHookTarget34.kt | 1 - 24 files changed, 380 insertions(+), 39 deletions(-) create mode 100644 app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt create mode 100644 app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt create mode 100644 app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt create mode 100644 app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt create mode 100644 app/src/main/res/layout/fragment_preset_manage.xml diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/service/ConfigManager.kt b/app/src/main/java/icu/nullptr/hidemyapplist/service/ConfigManager.kt index e3ebdb1..76021b4 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/service/ConfigManager.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/service/ConfigManager.kt @@ -12,6 +12,7 @@ import java.io.File object ConfigManager { data class TemplateInfo(val name: String?, val isWhiteList: Boolean) + data class PresetInfo(val name: String, val translation: String) private const val TAG = "ConfigManager" private lateinit var config: JsonConfig diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/service/ServiceClient.kt b/app/src/main/java/icu/nullptr/hidemyapplist/service/ServiceClient.kt index 18e735e..6061701 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/service/ServiceClient.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/service/ServiceClient.kt @@ -88,6 +88,9 @@ object ServiceClient : IHMAService, IBinder.DeathRecipient { getServiceLegacy()?.handlePackageEvent(eventType, packageName) } + override fun getPackagesForPreset(presetName: String) = + getServiceLegacy()?.getPackagesForPreset(presetName) + override fun syncConfig(json: String) { getServiceLegacy()?.syncConfig(json) } diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt index 4f3845d..45627d4 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt @@ -4,7 +4,6 @@ import android.os.Build import android.os.Bundle import android.view.MenuItem import android.view.View -import android.view.ViewGroup import android.view.WindowInsets import android.widget.TextView import androidx.activity.addCallback @@ -23,6 +22,7 @@ import icu.nullptr.hidemyapplist.util.PackageHelper import kotlinx.coroutines.launch import org.frknkrc44.hma_oss.R import org.frknkrc44.hma_oss.databinding.FragmentAppSelectBinding +import org.frknkrc44.hma_oss.ui.fragment.AppPresetFragment abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { @@ -37,11 +37,11 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { navController.navigateUp() } - private fun applyFilter() { + protected fun applyFilter() { adapter.filter.filter(search) } - private fun sortList() { + protected open fun sortList() { lifecycleScope.launch { PackageHelper.sortList(firstComparator) applyFilter() @@ -78,11 +78,13 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { sortList() } + open fun getFragmentTitle() = getString(R.string.title_app_select) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { onBack() } setupToolbar( toolbar = binding.toolbar, - title = getString(R.string.title_app_select), + title = getFragmentTitle(), navigationIcon = R.drawable.baseline_arrow_back_24, navigationOnClick = { onBack() }, menuRes = R.menu.menu_app_list, @@ -161,17 +163,23 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { private val recyclerView: RecyclerView, private val emptyView: View ): RecyclerView.AdapterDataObserver() { - private val isScopeFragment = this@AppSelectFragment.javaClass == ScopeFragment::class.java + private val fragmentType by lazy { + when(this@AppSelectFragment.javaClass) { + ScopeFragment::class.java -> 0 + AppPresetFragment::class.java -> 1 + else -> 2 + } + } private fun checkIfEmpty() { - val emptyViewVisible = recyclerView.adapter!!.itemCount < if (isScopeFragment) 1 else 2 + val emptyViewVisible = recyclerView.adapter!!.itemCount < if (fragmentType < 2) 1 else 2 emptyView.visibility = if (emptyViewVisible) View.VISIBLE else View.GONE if (emptyViewVisible) { emptyView.findViewById(R.id.list_empty_text).text = getString( - if (isScopeFragment) { - R.string.list_empty_no_enabled - } else { - R.string.list_empty_no_apps + when (fragmentType) { + 0 -> R.string.list_empty_no_enabled + 1 -> R.string.list_empty_preset + else -> R.string.list_empty_no_apps } ) } diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt index 649cb7b..2537a3c 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt @@ -1,6 +1,5 @@ package icu.nullptr.hidemyapplist.ui.fragment -import android.graphics.Color import android.os.Build import android.os.Bundle import android.view.View @@ -12,7 +11,6 @@ import androidx.fragment.app.setFragmentResultListener import androidx.navigation.fragment.FragmentNavigatorExtras import androidx.recyclerview.widget.LinearLayoutManager import by.kirich1409.viewbindingdelegate.viewBinding -import com.google.android.material.transition.MaterialContainerTransform import icu.nullptr.hidemyapplist.common.JsonConfig import icu.nullptr.hidemyapplist.service.ConfigManager import icu.nullptr.hidemyapplist.ui.adapter.TemplateAdapter @@ -28,10 +26,12 @@ class TemplateManageFragment : Fragment(R.layout.fragment_template_manage) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + /* sharedElementEnterTransition = MaterialContainerTransform().apply { drawingViewId = R.id.nav_host_fragment scrimColor = Color.TRANSPARENT } + */ } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/util/PackageHelper.kt b/app/src/main/java/icu/nullptr/hidemyapplist/util/PackageHelper.kt index d360147..950fbb2 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/util/PackageHelper.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/util/PackageHelper.kt @@ -26,11 +26,15 @@ object PackageHelper { val icon: Bitmap ) - private object Comparators { + object Comparators { val byLabel = Comparator { o1, o2 -> - val n1 = loadAppLabel(o1).lowercase(Locale.getDefault()) - val n2 = loadAppLabel(o2).lowercase(Locale.getDefault()) - Collator.getInstance(Locale.getDefault()).compare(n1, n2) + try { + val n1 = loadAppLabel(o1).lowercase(Locale.getDefault()) + val n2 = loadAppLabel(o2).lowercase(Locale.getDefault()) + Collator.getInstance(Locale.getDefault()).compare(n1, n2) + } catch (_: Throwable) { + byPackageName.compare(o1, o2) + } } val byPackageName = Comparator { o1, o2 -> val n1 = o1.lowercase(Locale.getDefault()) @@ -38,14 +42,22 @@ object PackageHelper { Collator.getInstance(Locale.getDefault()).compare(n1, n2) } val byInstallTime = Comparator { o1, o2 -> - val n1 = loadPackageInfo(o1).firstInstallTime - val n2 = loadPackageInfo(o2).firstInstallTime - n2.compareTo(n1) + try { + val n1 = loadPackageInfo(o1).firstInstallTime + val n2 = loadPackageInfo(o2).firstInstallTime + n2.compareTo(n1) + } catch (_: Throwable) { + byPackageName.compare(o1, o2) + } } val byUpdateTime = Comparator { o1, o2 -> - val n1 = loadPackageInfo(o1).lastUpdateTime - val n2 = loadPackageInfo(o2).lastUpdateTime - n2.compareTo(n1) + try { + val n1 = loadPackageInfo(o1).lastUpdateTime + val n2 = loadPackageInfo(o2).lastUpdateTime + n2.compareTo(n1) + } catch (_: Throwable) { + byPackageName.compare(o1, o2) + } } } @@ -99,6 +111,10 @@ object PackageHelper { mAppList.emit(list) } + fun exists(packageName: String) = runBlocking { + packageCache.first().contains(packageName) + } + fun loadPackageInfo(packageName: String): PackageInfo = runBlocking { packageCache.first()[packageName]!!.info } diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt new file mode 100644 index 0000000..89381ad --- /dev/null +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt @@ -0,0 +1,58 @@ +package org.frknkrc44.hma_oss.ui.adapter + +import android.view.ViewGroup +import android.widget.Filter +import icu.nullptr.hidemyapplist.service.ServiceClient +import icu.nullptr.hidemyapplist.ui.adapter.AppSelectAdapter +import icu.nullptr.hidemyapplist.ui.view.AppItemView +import icu.nullptr.hidemyapplist.util.PackageHelper +import kotlinx.coroutines.runBlocking + +class AppPresetAdapter( + private val presetName: String +) : AppSelectAdapter() { + val packages by lazy { ServiceClient.getPackagesForPreset(presetName)?.toMutableList() ?: mutableListOf() } + + inner class ViewHolder(view: AppItemView) : AppSelectAdapter.ViewHolder(view) { + override fun bind(packageName: String) { + (itemView as AppItemView).let { + it.load(packageName) + it.alpha = if (!PackageHelper.exists(packageName)) 0.5f else 1.0f + } + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val view = AppItemView(parent.context, false) + view.layoutParams = ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT + ) + return ViewHolder(view) + } + + private inner class PresetFilter : Filter() { + override fun performFiltering(constraint: CharSequence): FilterResults { + return runBlocking { + val constraintLowered = constraint.toString().lowercase() + val filteredList = packages.filter { + if (constraintLowered.isEmpty()) return@filter true + val label = PackageHelper.loadAppLabel(it) + label.lowercase().contains(constraintLowered) || it.lowercase().contains(constraintLowered) + } + + FilterResults().also { it.values = filteredList } + } + } + + @Suppress("UNCHECKED_CAST", "NotifyDataSetChanged") + override fun publishResults(constraint: CharSequence, results: FilterResults) { + filteredList = results.values as List + notifyDataSetChanged() + } + } + + private val mFilter = PresetFilter() + + override fun getFilter(): Filter = mFilter +} diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt new file mode 100644 index 0000000..b27062b --- /dev/null +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt @@ -0,0 +1,75 @@ +package org.frknkrc44.hma_oss.ui.adapter + +import android.annotation.SuppressLint +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import icu.nullptr.hidemyapplist.common.AppPresets +import icu.nullptr.hidemyapplist.hmaApp +import icu.nullptr.hidemyapplist.service.ConfigManager +import icu.nullptr.hidemyapplist.ui.view.ListItemView +import org.frknkrc44.hma_oss.BuildConfig +import org.frknkrc44.hma_oss.R + +class AppPresetListAdapter( + private val onClickListener: ((ConfigManager.PresetInfo) -> Unit)? +) : RecyclerView.Adapter() { + + private lateinit var list: List + + init { + updateList() + } + + inner class ViewHolder(view: ListItemView) : RecyclerView.ViewHolder(view) { + init { + view.setOnClickListener { + onClickListener?.invoke(list[absoluteAdapterPosition]) + } + } + + fun bind(presetName: String) { + with(itemView as ListItemView) { + setIcon(R.drawable.baseline_assignment_24) + text = presetName + } + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val view = ListItemView(parent.context) + view.layoutParams = ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT + ) + return ViewHolder(view) + } + + override fun getItemCount() = list.size + + override fun getItemId(position: Int) = list[position].name.hashCode().toLong() + + override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(list[position].translation) + + @SuppressLint("NotifyDataSetChanged") + fun updateList() { + val presetNames = AppPresets.instance.getAllPresetNames() + val presetTranslations = presetNames.map { name -> + try { + val id = hmaApp.resources.getIdentifier( + "preset_${name}", + "string", + BuildConfig.APPLICATION_ID + ) + + return@map if (id != 0) { hmaApp.resources.getString(id) } else { name } + } catch (_: Throwable) {} + + name + } + + list = presetNames + .map { ConfigManager.PresetInfo(it, presetTranslations[presetNames.indexOf(it)]) } + .sortedWith { a, b -> a.translation.lowercase().compareTo(b.translation.lowercase()) } + notifyDataSetChanged() + } +} diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt new file mode 100644 index 0000000..43225a3 --- /dev/null +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt @@ -0,0 +1,50 @@ +package org.frknkrc44.hma_oss.ui.fragment + +import android.os.Bundle +import androidx.lifecycle.lifecycleScope +import androidx.navigation.fragment.navArgs +import icu.nullptr.hidemyapplist.service.PrefManager +import icu.nullptr.hidemyapplist.ui.fragment.AppSelectFragment +import icu.nullptr.hidemyapplist.util.PackageHelper +import icu.nullptr.hidemyapplist.util.PackageHelper.Comparators +import kotlinx.coroutines.launch +import org.frknkrc44.hma_oss.ui.adapter.AppPresetAdapter + +class AppPresetFragment() : AppSelectFragment() { + + override val firstComparator = Comparator.comparing(PackageHelper::exists).reversed() + + override val adapter by lazy { + val args by navArgs() + AppPresetAdapter(args.presetName) + } + + override fun getFragmentTitle(): String { + val args by navArgs() + return args.presetTitle + } + + override fun sortList() { + lifecycleScope.launch { + sortPresetList() + applyFilter() + } + } + + fun sortPresetList() { + var comparator = when (PrefManager.appFilter_sortMethod) { + PrefManager.SortMethod.BY_LABEL -> Comparators.byLabel + PrefManager.SortMethod.BY_PACKAGE_NAME -> Comparators.byPackageName + PrefManager.SortMethod.BY_INSTALL_TIME -> Comparators.byInstallTime + PrefManager.SortMethod.BY_UPDATE_TIME -> Comparators.byUpdateTime + } + if (PrefManager.appFilter_reverseOrder) comparator = comparator.reversed() + adapter.packages.sortWith(firstComparator.then(comparator)) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + // enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true) + // returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false) + } +} \ No newline at end of file diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt index 62fc204..68b0a8c 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt @@ -267,6 +267,14 @@ class HomeFragment : Fragment(R.layout.fragment_home) { } } + with(binding.managePresets) { + text1.text = getString(R.string.title_preset_manage) + icon.setImageResource(R.drawable.baseline_my_location_24) + root.setOnClickListener { + navigate(R.id.nav_presets) + } + } + with(binding.navLogs) { text1.text = getString(R.string.title_logs) icon.setImageResource(R.drawable.outline_assignment_24) diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt new file mode 100644 index 0000000..d57c65b --- /dev/null +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt @@ -0,0 +1,73 @@ +package org.frknkrc44.hma_oss.ui.fragment + +import android.os.Build +import android.os.Bundle +import android.view.View +import android.view.WindowInsets +import androidx.core.view.doOnPreDraw +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import by.kirich1409.viewbindingdelegate.viewBinding +import icu.nullptr.hidemyapplist.service.ConfigManager +import icu.nullptr.hidemyapplist.ui.util.navController +import icu.nullptr.hidemyapplist.ui.util.setupToolbar +import org.frknkrc44.hma_oss.R +import org.frknkrc44.hma_oss.databinding.FragmentPresetManageBinding +import org.frknkrc44.hma_oss.ui.adapter.AppPresetListAdapter + +class PresetManageFragment : Fragment(R.layout.fragment_preset_manage) { + + private val binding by viewBinding() + private val adapter = AppPresetListAdapter(this::navigateToPreset) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + /* + sharedElementEnterTransition = MaterialContainerTransform().apply { + drawingViewId = R.id.nav_host_fragment + scrimColor = Color.TRANSPARENT + } + */ + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + setupToolbar( + toolbar = binding.toolbar, + title = getString(R.string.title_preset_manage), + navigationIcon = R.drawable.baseline_arrow_back_24, + navigationOnClick = { navController.navigateUp() } + ) + postponeEnterTransition() + view.doOnPreDraw { startPostponedEnterTransition() } + + binding.presetList.layoutManager = LinearLayoutManager(context) + binding.presetList.adapter = adapter + + binding.root.setOnApplyWindowInsetsListener { v, insets -> + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + val barInsets = insets.getInsets(WindowInsets.Type.systemBars()) + binding.root.setPadding( + barInsets.left, + barInsets.top, + barInsets.right, + barInsets.bottom, + ) + } else { + @Suppress("deprecation") + binding.root.setPadding( + insets.systemWindowInsetLeft, + insets.systemWindowInsetTop, + insets.systemWindowInsetRight, + insets.systemWindowInsetBottom, + ) + } + + insets + } + } + + private fun navigateToPreset(presetInfo: ConfigManager.PresetInfo) { + val args = AppPresetFragmentArgs(presetInfo.name, presetInfo.translation) + navController.navigate(R.id.nav_preset_inner_manage, args.toBundle()) + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 798f570..5f03305 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -54,6 +54,10 @@ android:id="@+id/manage_templates" layout="@layout/view_home_item" /> + + @@ -75,6 +79,8 @@ android:id="@+id/backup_config" app:icon="@drawable/outline_backup_24" android:text="@string/home_backup_config" + android:maxLines="1" + android:ellipsize="end" android:layout_marginRight="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -84,6 +90,8 @@ android:id="@+id/restore_config" app:icon="@drawable/outline_settings_backup_restore_24" android:text="@string/home_restore_config" + android:maxLines="1" + android:ellipsize="end" android:layout_marginLeft="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/fragment_preset_manage.xml b/app/src/main/res/layout/fragment_preset_manage.xml new file mode 100644 index 0000000..2544f26 --- /dev/null +++ b/app/src/main/res/layout/fragment_preset_manage.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/navigation/home_nav_graph.xml b/app/src/main/res/navigation/home_nav_graph.xml index 914c535..3f8d60e 100644 --- a/app/src/main/res/navigation/home_nav_graph.xml +++ b/app/src/main/res/navigation/home_nav_graph.xml @@ -22,6 +22,10 @@ android:id="@+id/nav_template_manage" android:name="icu.nullptr.hidemyapplist.ui.fragment.TemplateManageFragment" android:label="@string/title_template_manage" /> + + + + + 6dp 1dp + 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0cc8451..8e0c3bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -67,6 +67,7 @@ By update time Try enabling hiding for apps with this template\'s work mode and apps will appear here No applications found, maybe you didn\'t allow this app to query all packages + No applications added in this preset Establish templates for \"restless\" apps, controlling applist they can obtain.\n\nBlacklist (recommended): the apps selected in the template will be invisible to the apps applying the template.\nWhitelist: the apps not selected in the template will be invisible to the apps applying the template. @@ -106,7 +107,8 @@ You can enable it if this app is not available at Play Store Don\'t forget to force stop the target app after saving the configuration - + + Show presets LSPosed/Xposed modules Root managers/Rooted apps Custom ROM apps diff --git a/common/src/main/aidl/icu/nullptr/hidemyapplist/common/IHMAService.aidl b/common/src/main/aidl/icu/nullptr/hidemyapplist/common/IHMAService.aidl index 42a8607..12c19cb 100644 --- a/common/src/main/aidl/icu/nullptr/hidemyapplist/common/IHMAService.aidl +++ b/common/src/main/aidl/icu/nullptr/hidemyapplist/common/IHMAService.aidl @@ -15,4 +15,6 @@ interface IHMAService { void clearLogs() = 5; void handlePackageEvent(String eventType, String packageName) = 6; + + String[] getPackagesForPreset(String presetName) = 7; } diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/BasePreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/BasePreset.kt index d317c34..43782d7 100644 --- a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/BasePreset.kt +++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/BasePreset.kt @@ -12,6 +12,8 @@ abstract class BasePreset(val name: String) { fun containsPackage(packageName: String) = exactPackageNames.contains(packageName) || packageNames.contains(packageName) + val packages get() = packageNames + exactPackageNames + fun addPackageInfoPreset(appInfo: ApplicationInfo): Boolean { val packageName = appInfo.packageName if (!exactPackageNames.contains(packageName) && canBeAddedIntoPreset(appInfo)) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5889b09..13c7777 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.12.1" +agp = "8.13.0" kotlin = "2.1.10" material = "1.13.0-rc01" rxhttp = "3.3.1" @@ -13,7 +13,6 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi ksp = { id = "com.google.devtools.ksp", version = "2.1.10-1.0.31" } nav-safeargs-kotlin = { id = "androidx.navigation.safeargs.kotlin", version = "2.8.8" } autoresconfig = { id = "dev.rikka.tools.autoresconfig", version = "1.2.2" } -materialthemebuilder = { id = "dev.rikka.tools.materialthemebuilder", version = "1.5.1" } refine = { id = "dev.rikka.tools.refine", version = "4.4.0" } [libraries] diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt index 9777bf0..4d0d17e 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt @@ -277,4 +277,7 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() { Intent.ACTION_PACKAGE_REMOVED -> AppPresets.instance.handlePackageRemoved(packageName) } } + + override fun getPackagesForPreset(presetName: String) = + AppPresets.instance.getPresetByName(presetName)?.packages?.toTypedArray() } diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/XposedEntry.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/XposedEntry.kt index f691005..0764690 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/XposedEntry.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/XposedEntry.kt @@ -3,14 +3,11 @@ package icu.nullptr.hidemyapplist.xposed import android.content.pm.IPackageManager import com.github.kyuubiran.ezxhelper.init.EzXHelperInit import com.github.kyuubiran.ezxhelper.utils.findMethod -import com.github.kyuubiran.ezxhelper.utils.getFieldByDesc -import com.github.kyuubiran.ezxhelper.utils.hookAllConstructorAfter import com.github.kyuubiran.ezxhelper.utils.hookBefore import de.robv.android.xposed.IXposedHookLoadPackage import de.robv.android.xposed.IXposedHookZygoteInit import de.robv.android.xposed.XC_MethodHook import de.robv.android.xposed.callbacks.XC_LoadPackage -import icu.nullptr.hidemyapplist.common.Constants import kotlin.concurrent.thread private const val TAG = "HMA-XposedEntry" diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt index 873947a..12ab1bb 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget28.kt @@ -1,20 +1,16 @@ package icu.nullptr.hidemyapplist.xposed.hook import android.content.pm.ResolveInfo -import android.os.Binder import com.github.kyuubiran.ezxhelper.utils.findMethod import com.github.kyuubiran.ezxhelper.utils.hookAfter import com.github.kyuubiran.ezxhelper.utils.hookBefore -import de.robv.android.xposed.XC_MethodHook import icu.nullptr.hidemyapplist.common.Constants -import icu.nullptr.hidemyapplist.common.Constants.VENDING_PACKAGE_NAME import icu.nullptr.hidemyapplist.common.Utils import icu.nullptr.hidemyapplist.xposed.HMAService import icu.nullptr.hidemyapplist.xposed.Utils4Xposed import icu.nullptr.hidemyapplist.xposed.logD import icu.nullptr.hidemyapplist.xposed.logE import icu.nullptr.hidemyapplist.xposed.logI -import java.util.concurrent.atomic.AtomicReference class PmsHookTarget28(service: HMAService) : PmsHookTargetBase(service) { diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt index e33585b..7de7691 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget30.kt @@ -1,6 +1,5 @@ package icu.nullptr.hidemyapplist.xposed.hook -import android.content.pm.PackageManager import android.os.Build import androidx.annotation.RequiresApi import com.github.kyuubiran.ezxhelper.utils.findConstructor diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt index a5688a7..71fe3f9 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget33.kt @@ -1,16 +1,12 @@ package icu.nullptr.hidemyapplist.xposed.hook import android.content.pm.PackageInstaller -import android.content.pm.PackageManager -import android.os.Binder import android.os.Build import androidx.annotation.RequiresApi import com.github.kyuubiran.ezxhelper.utils.findConstructor import com.github.kyuubiran.ezxhelper.utils.findMethod -import com.github.kyuubiran.ezxhelper.utils.findMethodOrNull import com.github.kyuubiran.ezxhelper.utils.hookBefore import com.github.kyuubiran.ezxhelper.utils.paramCount -import de.robv.android.xposed.XC_MethodHook import icu.nullptr.hidemyapplist.common.Constants import icu.nullptr.hidemyapplist.common.Constants.VENDING_PACKAGE_NAME import icu.nullptr.hidemyapplist.common.Utils @@ -19,7 +15,6 @@ import icu.nullptr.hidemyapplist.xposed.Utils4Xposed import icu.nullptr.hidemyapplist.xposed.logD import icu.nullptr.hidemyapplist.xposed.logE import icu.nullptr.hidemyapplist.xposed.logI -import java.util.concurrent.atomic.AtomicReference @RequiresApi(Build.VERSION_CODES.TIRAMISU) class PmsHookTarget33(service: HMAService) : PmsHookTargetBase(service) { diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt index 5e67c86..5b8de07 100644 --- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt +++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/hook/PmsHookTarget34.kt @@ -1,7 +1,6 @@ package icu.nullptr.hidemyapplist.xposed.hook import android.content.pm.PackageInstaller -import android.content.pm.PackageManager import android.os.Binder import android.os.Build import androidx.annotation.RequiresApi From 7d743b085e949455fdacf88c796a6db91aa01b9d Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Thu, 11 Sep 2025 21:57:12 +0300 Subject: [PATCH 11/16] Fix "Show presets" display language, fix freezing when loading preset details, update translations --- .../ui/fragment/AppSelectFragment.kt | 10 ++- .../ui/fragment/TemplateManageFragment.kt | 10 --- .../ui/fragment/TemplateSettingsFragment.kt | 10 --- .../hma_oss/ui/adapter/AppPresetAdapter.kt | 9 ++- .../ui/adapter/AppPresetListAdapter.kt | 13 ++-- .../hma_oss/ui/fragment/AppPresetFragment.kt | 41 ++++++++++--- .../ui/fragment/PresetManageFragment.kt | 14 ++--- .../main/res/layout/fragment_app_select.xml | 61 +++++++++++-------- .../hidemyapplist/common/AppPresets.kt | 11 +--- .../hidemyapplist/common/SettingsPresets.kt | 11 +--- 10 files changed, 95 insertions(+), 95 deletions(-) diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt index 45627d4..b7be401 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt @@ -26,7 +26,7 @@ import org.frknkrc44.hma_oss.ui.fragment.AppPresetFragment abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { - private val binding by viewBinding() + protected val binding by viewBinding() protected abstract val firstComparator: Comparator protected abstract val adapter: AppSelectAdapter @@ -48,6 +48,10 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { } } + open fun invalidateCache() { + PackageHelper.invalidateCache() + } + private fun onMenuOptionSelected(item: MenuItem) { when (item.itemId) { R.id.menu_show_system -> { @@ -115,7 +119,7 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { binding.list.layoutManager = LinearLayoutManager(context) binding.list.adapter = adapter binding.swipeRefresh.setOnRefreshListener { - PackageHelper.invalidateCache() + invalidateCache() } adapter.registerAdapterDataObserver( @@ -183,7 +187,7 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { } ) } - (recyclerView.parent as View).visibility = if (emptyViewVisible) View.GONE else View.VISIBLE + recyclerView.visibility = if (emptyViewVisible) View.GONE else View.VISIBLE } override fun onChanged() { diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt index 2537a3c..4bb088b 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateManageFragment.kt @@ -24,16 +24,6 @@ class TemplateManageFragment : Fragment(R.layout.fragment_template_manage) { private val binding by viewBinding() private val adapter = TemplateAdapter(this::navigateToSettings) - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - /* - sharedElementEnterTransition = MaterialContainerTransform().apply { - drawingViewId = R.id.nav_host_fragment - scrimColor = Color.TRANSPARENT - } - */ - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { setupToolbar( toolbar = binding.toolbar, diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt index 1735ce6..8898ab6 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt @@ -56,16 +56,6 @@ class TemplateSettingsFragment : Fragment(R.layout.fragment_template_settings) { navController.navigateUp() } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - /* - sharedElementEnterTransition = MaterialContainerTransform().apply { - drawingViewId = R.id.nav_host_fragment - scrimColor = Color.TRANSPARENT - } - */ - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { onBack(false) } setupToolbar( diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt index 89381ad..985c61c 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt @@ -7,11 +7,17 @@ import icu.nullptr.hidemyapplist.ui.adapter.AppSelectAdapter import icu.nullptr.hidemyapplist.ui.view.AppItemView import icu.nullptr.hidemyapplist.util.PackageHelper import kotlinx.coroutines.runBlocking +import kotlin.lazy class AppPresetAdapter( private val presetName: String ) : AppSelectAdapter() { - val packages by lazy { ServiceClient.getPackagesForPreset(presetName)?.toMutableList() ?: mutableListOf() } + var packages = mutableListOf() + + fun updateList() { + packages.clear() + packages += ServiceClient.getPackagesForPreset(presetName)?.toList() ?: listOf() + } inner class ViewHolder(view: AppItemView) : AppSelectAdapter.ViewHolder(view) { override fun bind(packageName: String) { @@ -32,6 +38,7 @@ class AppPresetAdapter( } private inner class PresetFilter : Filter() { + override fun performFiltering(constraint: CharSequence): FilterResults { return runBlocking { val constraintLowered = constraint.toString().lowercase() diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt index b27062b..d5445b1 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetListAdapter.kt @@ -1,23 +1,24 @@ package org.frknkrc44.hma_oss.ui.adapter import android.annotation.SuppressLint +import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import icu.nullptr.hidemyapplist.common.AppPresets -import icu.nullptr.hidemyapplist.hmaApp import icu.nullptr.hidemyapplist.service.ConfigManager import icu.nullptr.hidemyapplist.ui.view.ListItemView import org.frknkrc44.hma_oss.BuildConfig import org.frknkrc44.hma_oss.R class AppPresetListAdapter( + context: Context, private val onClickListener: ((ConfigManager.PresetInfo) -> Unit)? ) : RecyclerView.Adapter() { private lateinit var list: List init { - updateList() + updateList(context) } inner class ViewHolder(view: ListItemView) : RecyclerView.ViewHolder(view) { @@ -50,18 +51,18 @@ class AppPresetListAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(list[position].translation) - @SuppressLint("NotifyDataSetChanged") - fun updateList() { + @SuppressLint("NotifyDataSetChanged", "DiscouragedApi") + private fun updateList(context: Context) { val presetNames = AppPresets.instance.getAllPresetNames() val presetTranslations = presetNames.map { name -> try { - val id = hmaApp.resources.getIdentifier( + val id = context.resources.getIdentifier( "preset_${name}", "string", BuildConfig.APPLICATION_ID ) - return@map if (id != 0) { hmaApp.resources.getString(id) } else { name } + return@map if (id != 0) { context.resources.getString(id) } else { name } } catch (_: Throwable) {} name diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt index 43225a3..d97e261 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt @@ -1,18 +1,25 @@ package org.frknkrc44.hma_oss.ui.fragment import android.os.Bundle +import android.view.View import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.navArgs +import icu.nullptr.hidemyapplist.hmaApp import icu.nullptr.hidemyapplist.service.PrefManager import icu.nullptr.hidemyapplist.ui.fragment.AppSelectFragment import icu.nullptr.hidemyapplist.util.PackageHelper import icu.nullptr.hidemyapplist.util.PackageHelper.Comparators +import kotlinx.coroutines.CoroutineStart +import kotlinx.coroutines.async +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.delay import kotlinx.coroutines.launch import org.frknkrc44.hma_oss.ui.adapter.AppPresetAdapter +import kotlin.coroutines.suspendCoroutine class AppPresetFragment() : AppSelectFragment() { - override val firstComparator = Comparator.comparing(PackageHelper::exists).reversed() + override val firstComparator: Comparator = Comparator.comparing(PackageHelper::exists).reversed() override val adapter by lazy { val args by navArgs() @@ -25,9 +32,12 @@ class AppPresetFragment() : AppSelectFragment() { } override fun sortList() { - lifecycleScope.launch { + hmaApp.globalScope.launch { sortPresetList() - applyFilter() + + lifecycleScope.launch { + applyFilter() + } } } @@ -39,12 +49,27 @@ class AppPresetFragment() : AppSelectFragment() { PrefManager.SortMethod.BY_UPDATE_TIME -> Comparators.byUpdateTime } if (PrefManager.appFilter_reverseOrder) comparator = comparator.reversed() - adapter.packages.sortWith(firstComparator.then(comparator)) + + val packages = adapter.packages.sortedWith(firstComparator.then(comparator)) + + lifecycleScope.launch { + adapter.packages.clear() + adapter.packages += packages + } } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - // enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true) - // returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false) + override fun invalidateCache() { + super.invalidateCache() + adapter.updateList() + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + lifecycleScope.launch { + binding.swipeRefresh.isRefreshing = true + adapter.updateList() + sortList() + } } } \ No newline at end of file diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt index d57c65b..2607c28 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt @@ -6,11 +6,13 @@ import android.view.View import android.view.WindowInsets import androidx.core.view.doOnPreDraw import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import by.kirich1409.viewbindingdelegate.viewBinding import icu.nullptr.hidemyapplist.service.ConfigManager import icu.nullptr.hidemyapplist.ui.util.navController import icu.nullptr.hidemyapplist.ui.util.setupToolbar +import kotlinx.coroutines.launch import org.frknkrc44.hma_oss.R import org.frknkrc44.hma_oss.databinding.FragmentPresetManageBinding import org.frknkrc44.hma_oss.ui.adapter.AppPresetListAdapter @@ -18,16 +20,8 @@ import org.frknkrc44.hma_oss.ui.adapter.AppPresetListAdapter class PresetManageFragment : Fragment(R.layout.fragment_preset_manage) { private val binding by viewBinding() - private val adapter = AppPresetListAdapter(this::navigateToPreset) - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - /* - sharedElementEnterTransition = MaterialContainerTransform().apply { - drawingViewId = R.id.nav_host_fragment - scrimColor = Color.TRANSPARENT - } - */ + private val adapter by lazy { + AppPresetListAdapter(requireContext(), this::navigateToPreset) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/res/layout/fragment_app_select.xml b/app/src/main/res/layout/fragment_app_select.xml index 66696a6..696c165 100644 --- a/app/src/main/res/layout/fragment_app_select.xml +++ b/app/src/main/res/layout/fragment_app_select.xml @@ -32,35 +32,42 @@ android:clipToPadding="false" android:scrollbars="vertical"> - + android:layout_height="match_parent"> + + + + + + + + + + + - - - - - - diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/AppPresets.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/AppPresets.kt index 73851b7..437710a 100644 --- a/common/src/main/java/icu/nullptr/hidemyapplist/common/AppPresets.kt +++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/AppPresets.kt @@ -16,16 +16,7 @@ class AppPresets private constructor() { var loggerFunction: ((String) -> Unit)? = null companion object { - private var hiddenInstance: AppPresets? = null - - val instance: AppPresets - get() { - if (hiddenInstance == null) { - hiddenInstance = AppPresets() - } - - return hiddenInstance!! - } + val instance by lazy { AppPresets() } } fun getAllPresetNames() = presetList.map { it.name }.toTypedArray() diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/SettingsPresets.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/SettingsPresets.kt index 42b8529..85d5be9 100644 --- a/common/src/main/java/icu/nullptr/hidemyapplist/common/SettingsPresets.kt +++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/SettingsPresets.kt @@ -8,16 +8,7 @@ class SettingsPresets private constructor() { private val presetList = mutableListOf() companion object { - private var hiddenInstance: SettingsPresets? = null - - val instance: SettingsPresets - get() { - if (hiddenInstance == null) { - hiddenInstance = SettingsPresets() - } - - return hiddenInstance!! - } + val instance by lazy { SettingsPresets() } } fun getAllPresetNames() = presetList.map { it.name }.toTypedArray() From d9a8e0d5a944ccdfc6080b2c0f73de1e7376b117 Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Thu, 11 Sep 2025 23:09:09 +0300 Subject: [PATCH 12/16] Optimize imports, try to add GitHub release support This is not a code change release, so you can continue to use the previous version. --- .../org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt | 1 - .../org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt | 5 ----- .../frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt | 2 -- 3 files changed, 8 deletions(-) diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt index 985c61c..2d49326 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt @@ -7,7 +7,6 @@ import icu.nullptr.hidemyapplist.ui.adapter.AppSelectAdapter import icu.nullptr.hidemyapplist.ui.view.AppItemView import icu.nullptr.hidemyapplist.util.PackageHelper import kotlinx.coroutines.runBlocking -import kotlin.lazy class AppPresetAdapter( private val presetName: String diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt index d97e261..3ada7a2 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt @@ -9,13 +9,8 @@ import icu.nullptr.hidemyapplist.service.PrefManager import icu.nullptr.hidemyapplist.ui.fragment.AppSelectFragment import icu.nullptr.hidemyapplist.util.PackageHelper import icu.nullptr.hidemyapplist.util.PackageHelper.Comparators -import kotlinx.coroutines.CoroutineStart -import kotlinx.coroutines.async -import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import org.frknkrc44.hma_oss.ui.adapter.AppPresetAdapter -import kotlin.coroutines.suspendCoroutine class AppPresetFragment() : AppSelectFragment() { diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt index 2607c28..6849c61 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt @@ -6,13 +6,11 @@ import android.view.View import android.view.WindowInsets import androidx.core.view.doOnPreDraw import androidx.fragment.app.Fragment -import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import by.kirich1409.viewbindingdelegate.viewBinding import icu.nullptr.hidemyapplist.service.ConfigManager import icu.nullptr.hidemyapplist.ui.util.navController import icu.nullptr.hidemyapplist.ui.util.setupToolbar -import kotlinx.coroutines.launch import org.frknkrc44.hma_oss.R import org.frknkrc44.hma_oss.databinding.FragmentPresetManageBinding import org.frknkrc44.hma_oss.ui.adapter.AppPresetListAdapter From 4942a02337ac9ddfcf327592818aa34e0bc1b18d Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Fri, 12 Sep 2025 17:30:44 +0300 Subject: [PATCH 13/16] Fix a few crashes on search functions, remove useless permissions, update translations --- app/src/main/AndroidManifest.xml | 2 -- .../ui/adapter/AppSelectAdapter.kt | 9 ++++++--- .../ui/fragment/AppSelectFragment.kt | 8 +++++++- .../hma_oss/ui/adapter/AppPresetAdapter.kt | 20 ++++++++++++++----- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3a9950a..6ddd65a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,8 +6,6 @@ android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="PackageVisibilityPolicy,QueryAllPackagesPermission" /> - - - notifyDataSetChanged() + val values = results.values + if (values != null) { + filteredList = values as List + notifyDataSetChanged() + } } } diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt index b7be401..066b962 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSelectFragment.kt @@ -175,8 +175,14 @@ abstract class AppSelectFragment : Fragment(R.layout.fragment_app_select) { } } + val atLeastEntryCount: Int get() { + if (!search.isBlank()) return 0 + + return if (fragmentType < 2) 1 else 2 + } + private fun checkIfEmpty() { - val emptyViewVisible = recyclerView.adapter!!.itemCount < if (fragmentType < 2) 1 else 2 + val emptyViewVisible = recyclerView.adapter!!.itemCount < atLeastEntryCount emptyView.visibility = if (emptyViewVisible) View.VISIBLE else View.GONE if (emptyViewVisible) { emptyView.findViewById(R.id.list_empty_text).text = getString( diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt index 2d49326..6185b3b 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt @@ -40,11 +40,18 @@ class AppPresetAdapter( override fun performFiltering(constraint: CharSequence): FilterResults { return runBlocking { - val constraintLowered = constraint.toString().lowercase() + val constraintLowered = constraint.toString().trim().lowercase() val filteredList = packages.filter { if (constraintLowered.isEmpty()) return@filter true - val label = PackageHelper.loadAppLabel(it) - label.lowercase().contains(constraintLowered) || it.lowercase().contains(constraintLowered) + + if (it.lowercase().contains(constraintLowered)) return@filter true + + try { + val label = PackageHelper.loadAppLabel(it) + return@filter label.lowercase().contains(constraintLowered) + } catch (e: Throwable) { + return@filter false + } } FilterResults().also { it.values = filteredList } @@ -53,8 +60,11 @@ class AppPresetAdapter( @Suppress("UNCHECKED_CAST", "NotifyDataSetChanged") override fun publishResults(constraint: CharSequence, results: FilterResults) { - filteredList = results.values as List - notifyDataSetChanged() + val values = results.values + if (values != null) { + filteredList = values as List + notifyDataSetChanged() + } } } From 3b1fb478caaa51bc0694ab993b0a9090febf4c3e Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Mon, 1 Sep 2025 20:32:26 +0300 Subject: [PATCH 14/16] Add risky package warning with bypass switch --- .../hidemyapplist/service/PrefManager.kt | 5 +++++ .../ui/adapter/AppManageAdapter.kt | 19 +++++++++++++++++++ .../ui/fragment/SettingsFragment.kt | 7 +++++++ .../hidemyapplist/ui/view/AppItemView.kt | 2 +- app/src/main/res/values/strings.xml | 4 ++++ app/src/main/res/xml/settings.xml | 5 +++++ 6 files changed, 41 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/service/PrefManager.kt b/app/src/main/java/icu/nullptr/hidemyapplist/service/PrefManager.kt index 022a034..eef3c8e 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/service/PrefManager.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/service/PrefManager.kt @@ -19,6 +19,7 @@ object PrefManager { private const val PREF_THEME_COLOR = "theme_color" private const val PREF_HIDE_ICON = "hide_icon" + private const val PREF_BYPASS_RISKY_PACKAGE_WARNING = "bypass_risky_package_warning" private const val PREF_APP_FILTER_SHOW_SYSTEM = "app_filter_show_system" private const val PREF_APP_FILTER_SORT_METHOD = "app_filter_sort_method" @@ -67,6 +68,10 @@ object PrefManager { hmaApp.packageManager.setComponentEnabledSetting(component, status, PackageManager.DONT_KILL_APP) } + var bypassRiskyPackageWarning: Boolean + get() = pref.getBoolean(PREF_BYPASS_RISKY_PACKAGE_WARNING, false) + set(value) = pref.edit().putBoolean(PREF_BYPASS_RISKY_PACKAGE_WARNING, value).apply() + var appFilter_showSystem: Boolean get() = pref.getBoolean(PREF_APP_FILTER_SHOW_SYSTEM, false) set(value) = pref.edit().putBoolean(PREF_APP_FILTER_SHOW_SYSTEM, value).apply() diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppManageAdapter.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppManageAdapter.kt index 75f1713..e50c71d 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppManageAdapter.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/adapter/AppManageAdapter.kt @@ -1,16 +1,35 @@ package icu.nullptr.hidemyapplist.ui.adapter import android.view.ViewGroup +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import icu.nullptr.hidemyapplist.common.Constants.GMS_PACKAGE_NAME +import icu.nullptr.hidemyapplist.common.Constants.GSF_PACKAGE_NAME import icu.nullptr.hidemyapplist.service.ConfigManager +import icu.nullptr.hidemyapplist.service.PrefManager import icu.nullptr.hidemyapplist.ui.view.AppItemView +import org.frknkrc44.hma_oss.R class AppManageAdapter( private val onItemClickListener: (String) -> Unit ) : AppSelectAdapter() { + private val riskyPackages = arrayOf(GMS_PACKAGE_NAME, GSF_PACKAGE_NAME) inner class ViewHolder(view: AppItemView) : AppSelectAdapter.ViewHolder(view) { init { view.setOnClickListener { + if (!PrefManager.bypassRiskyPackageWarning && riskyPackages.contains(view.binding.packageName.text)) { + MaterialAlertDialogBuilder(view.context) + .setTitle(R.string.app_warning_risky_package_title) + .setMessage(R.string.app_warning_risky_package_desc) + .setNegativeButton(android.R.string.cancel, null) + .setPositiveButton(android.R.string.ok) { _, _ -> + onItemClickListener.invoke(filteredList[absoluteAdapterPosition]) + } + .show() + + return@setOnClickListener + } + onItemClickListener.invoke(filteredList[absoluteAdapterPosition]) } } diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/SettingsFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/SettingsFragment.kt index 6a86d59..05b8ecf 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/SettingsFragment.kt @@ -97,6 +97,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), PreferenceFragmen "blackDarkTheme" -> PrefManager.blackDarkTheme "detailLog" -> ConfigManager.detailLog "hideIcon" -> PrefManager.hideIcon + "bypassRiskyPackageWarning" -> PrefManager.bypassRiskyPackageWarning "appDataIsolation" -> CommonUtils.isAppDataIsolationEnabled "voldAppDataIsolation" -> CommonUtils.isVoldAppDataIsolationEnabled "forceMountData" -> ConfigManager.forceMountData @@ -121,6 +122,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), PreferenceFragmen "detailLog" -> ConfigManager.detailLog = value "forceMountData" -> ConfigManager.forceMountData = value "hideIcon" -> PrefManager.hideIcon = value + "bypassRiskyPackageWarning" -> PrefManager.bypassRiskyPackageWarning = value "appDataIsolation" -> Unit "voldAppDataIsolation" -> Unit else -> throw IllegalArgumentException("Invalid key: $key") @@ -267,6 +269,11 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), PreferenceFragmen configureDataIsolation() + findPreference("bypassRiskyPackageWarning")?.setOnPreferenceChangeListener { _, newValue -> + activity?.recreate() + true + } + findPreference("stopSystemService")?.setOnPreferenceClickListener { if (ServiceClient.serviceVersion != 0) { MaterialAlertDialogBuilder(requireContext()) diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt index 742dcc5..1589e39 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/view/AppItemView.kt @@ -15,7 +15,7 @@ class AppItemView @JvmOverloads constructor( defStyleRes: Int = 0 ) : LinearLayout(context, attrs, defStyleAttr, defStyleRes) { - private val binding by viewBinding(createMethod = CreateMethod.INFLATE) + val binding by viewBinding(createMethod = CreateMethod.INFLATE) var showEnabled: Boolean get() = binding.enabled.visibility == VISIBLE diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8e0c3bb..d7df6d9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -94,6 +94,8 @@ Using %d settings presets %d additional apps visible %d additional apps invisible + Risky package + This package is marked as risky and you can cause issues on hidden apps. Do you want to continue? Risky package @@ -142,6 +144,8 @@ Logger buffer sizes Hide module icon in launcher You can still open the app in Xposed manager + Bypass risky package warning + Note that the devs are not responsible for risky package related issues before or after you enabled this feature Language Participate in translation diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index b67f301..421ab63 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -33,6 +33,11 @@ + Date: Tue, 16 Sep 2025 23:44:00 +0700 Subject: [PATCH 15/16] fix: strings.xml: duplicate strings Signed-off-by: Cuynu --- app/src/main/res/values/strings.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d7df6d9..e61bbb2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -97,9 +97,6 @@ Risky package This package is marked as risky and you can cause issues on hidden apps. Do you want to continue? - - Risky package - This package is marked as risky and you can cause issues on hidden apps. Do you want to continue? Spoofing Spoof installation sources All of user apps will be spoofed as installed over Play Store for this application From 94fbc8babedfcd29918b13f874ce14b31859aa61 Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Mon, 15 Sep 2025 16:42:49 +0300 Subject: [PATCH 16/16] Fix Xposed module detection, add more packages to presets (thanks to ShirkNeko) This version also contains translation updates --- .../hidemyapplist/common/app_presets/CustomROMPreset.kt | 4 ++++ .../hidemyapplist/common/app_presets/RootAppsPreset.kt | 9 ++++++++- .../common/app_presets/XposedModulesPreset.kt | 9 +++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt index 96e6c4d..9e62392 100644 --- a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt +++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt @@ -11,6 +11,10 @@ class CustomROMPreset() : BasePreset("custom_rom") { override fun canBeAddedIntoPreset(appInfo: ApplicationInfo): Boolean { val packageName = appInfo.packageName + if (containsPackage(packageName)) { + return false + } + // LineageOS overlays if (appInfo.sourceDir.contains("_lineage_")) { return true diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/RootAppsPreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/RootAppsPreset.kt index f2764f0..920ece3 100644 --- a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/RootAppsPreset.kt +++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/RootAppsPreset.kt @@ -1,6 +1,7 @@ package icu.nullptr.hidemyapplist.common.app_presets import android.content.pm.ApplicationInfo +import icu.nullptr.hidemyapplist.common.Utils import java.util.zip.ZipFile class RootAppsPreset() : BasePreset("root_apps") { @@ -9,7 +10,6 @@ class RootAppsPreset() : BasePreset("root_apps") { "io.github.a13e300.ksuwebui", "io.github.muntashirakon.AppManager", "com.fox2code.mmm", - "xzr.hkf", "com.speedsoftware.rootexplorer", "id.kuato.diskhealth", "com.sunilpaulmathew.debloater", @@ -34,6 +34,8 @@ class RootAppsPreset() : BasePreset("root_apps") { "ru.nsu.bobrofon.easysshfs", "x1125io.initdlight", "com.lonelycatgames.Xplore", + "com.byyoung.setting", + "web1n.stopapp", // kernel managers "flar2.exkernelmanager", @@ -50,6 +52,11 @@ class RootAppsPreset() : BasePreset("root_apps") { return false } + // All libxzr apps (konabess, hkf, ...) + if (Utils.startsWithMultiple(packageName, "xzr.", "moe.xzr.")) { + return true + } + // FX File Manager if (packageName.startsWith("nextapp.fx")) { return true diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/XposedModulesPreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/XposedModulesPreset.kt index 665d707..65042db 100644 --- a/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/XposedModulesPreset.kt +++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/XposedModulesPreset.kt @@ -6,6 +6,11 @@ import java.util.zip.ZipFile class XposedModulesPreset() : BasePreset("xposed") { override val exactPackageNames = setOf() + companion object { + private const val XPOSED_PROP1 = "\u0000x\u0000p\u0000o\u0000s\u0000e\u0000d\u0000m\u0000o\u0000d\u0000u\u0000l\u0000e" + private const val XPOSED_PROP2 = "\u0000x\u0000p\u0000o\u0000s\u0000e\u0000d\u0000s\u0000c\u0000o\u0000p\u0000e" + } + override fun canBeAddedIntoPreset(appInfo: ApplicationInfo): Boolean { ZipFile(appInfo.sourceDir).use { zipFile -> val manifestFile = zipFile.getInputStream( @@ -14,9 +19,9 @@ class XposedModulesPreset() : BasePreset("xposed") { val manifestStr = String(manifestBytes, Charsets.US_ASCII) // Checking with binary because the Android system sucks - if (manifestStr.contains("\u0000x\u0000p\u0000o\u0000s\u0000e\u0000d\u0000m\u0000o\u0000d\u0000u\u0000l\u0000e")) { + if (manifestStr.contains(XPOSED_PROP1) || manifestStr.contains(XPOSED_PROP2)) { return true - } else if (zipFile.getEntry("META-INF/xposed")?.isDirectory ?: false) { + } else if (zipFile.getEntry("META-INF/xposed/module.prop") != null) { return true } }