diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/AiAsst.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/AiAsst.java index 9c7a471dca..f3256ad650 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/AiAsst.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/AiAsst.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.aiasst.AiCaptions; import com.sevtinge.hyperceiler.module.hook.aiasst.DisableWatermark; -@HookExpand(pkg = "com.xiaomi.aiasst.vision", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.aiasst.vision", isPad = false, tarAndroid = 33) public class AiAsst extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Aod.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Aod.java index 7fb17e16b6..96fc31cbf4 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Aod.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Aod.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.aod.UnlockAlwaysOnDisplay; import com.sevtinge.hyperceiler.module.hook.aod.UnlockAodAon; -@HookExpand(pkg = "com.miui.aod", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.aod", isPad = false, tarAndroid = 33) public class Aod extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Backup.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Backup.java index 2164cc544a..f23692e674 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Backup.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Backup.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.backup.AllowBackupAllApps; import com.sevtinge.hyperceiler.module.hook.backup.UnlockBrokenScreenBackup; -@HookExpand(pkg = "com.miui.backup", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.backup", isPad = false, tarAndroid = 33) public class Backup extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Barrage.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Barrage.java index 1e963ca8ae..4f73d8a984 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Barrage.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Barrage.java @@ -18,11 +18,12 @@ */ package com.sevtinge.hyperceiler.module.app; -import com.sevtinge.hyperceiler.module.base.HookExpand; -import com.sevtinge.hyperceiler.module.hook.barrage.*; import com.sevtinge.hyperceiler.module.base.BaseModule; +import com.sevtinge.hyperceiler.module.base.HookExpand; +import com.sevtinge.hyperceiler.module.hook.barrage.AnyBarrage; +import com.sevtinge.hyperceiler.module.hook.barrage.CustomBarrageLength; -@HookExpand(pkg = "com.xiaomi.barrage", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.barrage", isPad = false, tarAndroid = 33) public class Barrage extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Browser.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Browser.java index 6b648830d6..b6d3118765 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Browser.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Browser.java @@ -25,7 +25,7 @@ import com.sevtinge.hyperceiler.module.hook.browser.EnableDebugEnvironment; import com.sevtinge.hyperceiler.module.hook.various.UnlockSuperClipboard; -@HookExpand(pkg = "com.android.browser", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.browser", isPad = false, tarAndroid = 33) public class Browser extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Calendar.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Calendar.java index 95e5b40e62..b4c34cc5a8 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Calendar.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Calendar.java @@ -4,7 +4,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.calendar.UnlockSubscription; -@HookExpand(pkg = "com.android.calendar", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.calendar", isPad = false, tarAndroid = 33) public class Calendar extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Camera.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Camera.java index 722fdd4dfc..3f478272b7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Camera.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Camera.java @@ -67,7 +67,7 @@ import com.sevtinge.hyperceiler.module.hook.camera.UnlockVlog; import com.sevtinge.hyperceiler.module.hook.camera.UnlockVlogPro; -@HookExpand(pkg = "com.android.camera", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.camera", isPad = false, tarAndroid = 33) public class Camera extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ContentExtension.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ContentExtension.java index 1608b87d90..e6aca2b81c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ContentExtension.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ContentExtension.java @@ -18,8 +18,6 @@ */ package com.sevtinge.hyperceiler.module.app; -import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; - import com.sevtinge.hyperceiler.module.base.BaseModule; import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.contentextension.DoublePress; @@ -30,7 +28,7 @@ import com.sevtinge.hyperceiler.module.hook.contentextension.UnlockTaplus; import com.sevtinge.hyperceiler.module.hook.contentextension.UseThirdPartyBrowser; -@HookExpand(pkg = "com.miui.contentextension", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.contentextension", isPad = false, tarAndroid = 33) public class ContentExtension extends BaseModule { @Override @@ -39,11 +37,8 @@ public void handleLoadPackage() { initHook(new DoublePress(), mPrefsMap.getBoolean("content_extension_double_press")); initHook(new SuperImage(), mPrefsMap.getBoolean("content_extension_super_image")); initHook(new Taplus(), mPrefsMap.getBoolean("security_center_taplus")); - initHook(new LinkOpenMode()); + initHook(new LinkOpenMode(), true); initHook(HorizontalContentExtension.INSTANCE, mPrefsMap.getBoolean("content_extension_unlock_taplus_horizontal")); - - if (!isAndroidVersion(30)) { - initHook(UnlockTaplus.INSTANCE, mPrefsMap.getBoolean("content_extension_unlock_taplus")); - } + initHook(UnlockTaplus.INSTANCE, mPrefsMap.getBoolean("content_extension_unlock_taplus")); } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Creation.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Creation.java index d70e0b5c88..46292a7216 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Creation.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Creation.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.creation.UnlockCreation; import com.sevtinge.hyperceiler.module.hook.various.UnlockSuperClipboard; -@HookExpand(pkg = "com.miui.creation", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.creation", isPad = false, tarAndroid = 33) public class Creation extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Demo.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Demo.java index c570eaec24..39b52fc82c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Demo.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Demo.java @@ -5,9 +5,8 @@ import com.sevtinge.hyperceiler.module.hook.demo.ColorTest; import com.sevtinge.hyperceiler.module.hook.demo.CrashDemo; import com.sevtinge.hyperceiler.module.hook.demo.ToastTest; -import com.sevtinge.hyperceiler.utils.log.XposedLogUtils; -@HookExpand(pkg = "com.hchen.demo", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.hchen.demo", isPad = false, tarAndroid = 33) public class Demo extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Downloads.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Downloads.java index b2f3997704..6a062578a5 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Downloads.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Downloads.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.downloads.FuckXlDownload; -@HookExpand(pkg = "com.android.providers.downloads", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.providers.downloads", isPad = false, tarAndroid = 33) public class Downloads extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ExternalStorage.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ExternalStorage.java index de0434456e..23774ede3f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ExternalStorage.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ExternalStorage.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.externalstorage.DisableFolderCantUse; -@HookExpand(pkg = "com.android.externalstorage", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.externalstorage", isPad = false, tarAndroid = 33) public class ExternalStorage extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/FileExplorer.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/FileExplorer.java index a7a3ec944b..da8293db1e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/FileExplorer.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/FileExplorer.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.fileexplorer.SelectName; import com.sevtinge.hyperceiler.module.hook.various.UnlockSuperClipboard; -@HookExpand(pkg = "com.android.fileexplorer", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.fileexplorer", isPad = false, tarAndroid = 33) public class FileExplorer extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Gallery.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Gallery.java index efcf4fca3b..cc30c8370a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Gallery.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Gallery.java @@ -35,7 +35,7 @@ import com.sevtinge.hyperceiler.module.hook.gallery.UnlockAIGallery; import com.sevtinge.hyperceiler.module.hook.various.UnlockSuperClipboard; -@HookExpand(pkg = "com.miui.gallery", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.gallery", isPad = false, tarAndroid = 33) public class Gallery extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/GetApps.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/GetApps.java index 2625d04dcf..155b8b1647 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/GetApps.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/GetApps.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.getapps.DeviceModify; import com.sevtinge.hyperceiler.module.hook.getapps.DisablePackageMonitor; -@HookExpand(pkg = "com.xiaomi.market", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.market", isPad = false, tarAndroid = 33) public class GetApps extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/GuardProvider.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/GuardProvider.java index 7a3e4c49e6..c7fd556afe 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/GuardProvider.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/GuardProvider.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.guardprovider.DisableUploadAppListNew; -@HookExpand(pkg = "com.miui.guardprovider", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.guardprovider", isPad = false, tarAndroid = 33) public class GuardProvider extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Home.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Home/Phone/HomeT.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/module/app/Home.java rename to app/src/main/java/com/sevtinge/hyperceiler/module/app/Home/Phone/HomeT.java index 3b813ed9ba..a48b3dc02c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Home.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Home/Phone/HomeT.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.module.app; +package com.sevtinge.hyperceiler.module.app.Home.Phone; import static com.sevtinge.hyperceiler.utils.api.VoyagerApisKt.isPad; @@ -135,8 +135,8 @@ import java.util.Objects; -@HookExpand(pkg = "com.miui.home", isPad = false, tarAndroid = 34) -public class Home extends BaseModule { +@HookExpand(pkg = "com.miui.home", isPad = false, tarAndroid = 33) +public class HomeT extends BaseModule { @Override public void handleLoadPackage() { @@ -204,13 +204,13 @@ public void handleLoadPackage() { initHook(DisableRecentViewWallpaperDarken.INSTANCE, mPrefsMap.getBoolean("home_recent_disable_wallpaper_dimming")); initHook(HideStatusBarWhenEnterRecent.INSTANCE, mPrefsMap.getBoolean("home_recent_hide_status_bar_in_task_view")); initHook(RemoveCardAnim.INSTANCE, mPrefsMap.getBoolean("home_recent_modify_animation")); - initHook(TaskViewHorizontal.INSTANCE); - initHook(TaskViewVertical.INSTANCE); + initHook(TaskViewHorizontal.INSTANCE, true); + initHook(TaskViewVertical.INSTANCE, true); initHook(HideFreeform.INSTANCE, mPrefsMap.getBoolean("home_recent_hide_freeform")); initHook(new HideCleanUp(), mPrefsMap.getBoolean("home_recent_hide_clean_up")); - initHook(FreeformCardBackgroundColor.INSTANCE); - initHook(CardTextColor.INSTANCE); - initHook(CardTextSize.INSTANCE); + initHook(FreeformCardBackgroundColor.INSTANCE, true); + initHook(CardTextColor.INSTANCE, true); + initHook(CardTextSize.INSTANCE, true); initHook(UnlockPin.INSTANCE, mPrefsMap.getBoolean("home_recent_unlock_pin")); initHook(RecentText.INSTANCE, !Objects.equals(mPrefsMap.getString("home_recent_text", ""), "")); initHook(RemoveIcon.INSTANCE, mPrefsMap.getBoolean("home_recent_remove_icon")); @@ -238,7 +238,7 @@ public void handleLoadPackage() { initHook(new IconTitleCustomization(), mPrefsMap.getBoolean("home_title_title_icontitlecustomization_onoff")); initHook(new HiddenAllTitle(), mPrefsMap.getBoolean("home_drawer_font_hidden")); initHook(new TitleFontSize(), mPrefsMap.getInt("home_title_font_size", 12) != 12); - initHook(IconTitleColor.INSTANCE); + initHook(IconTitleColor.INSTANCE, true); initHook(new UnlockHotseatIcon(), mPrefsMap.getBoolean("home_dock_unlock_hotseat")); // 小部件 @@ -278,7 +278,7 @@ public void handleLoadPackage() { initHook(AlwaysBlurWallpaper.INSTANCE, mPrefsMap.getBoolean("home_other_always_blur_launcher_wallpaper")); initHook(BlurRadius.INSTANCE, mPrefsMap.getInt("home_other_blur_radius", 100) != 100); initHook(ShortcutItemCount.INSTANCE, mPrefsMap.getBoolean("home_other_shortcut_remove_restrictions")); - initHook(ShowAllHideApp.INSTANCE); // 桌面快捷方式管理 + initHook(ShowAllHideApp.INSTANCE, true); // 桌面快捷方式管理 initHook(new AllowShareApk(), mPrefsMap.getBoolean("home_other_allow_share_apk")); // 实验性功能 diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Huanji.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Huanji.java index 646742498f..703f3a0aab 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Huanji.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Huanji.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.huanji.AllowMoveAllApps; -@HookExpand(pkg = "com.miui.huanji", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.huanji", isPad = false, tarAndroid = 33) public class Huanji extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/InCallUi.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/InCallUi.java index 0cb8e74a3d..1f8324c3f0 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/InCallUi.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/InCallUi.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.incallui.AnswerInHeadUp; import com.sevtinge.hyperceiler.module.hook.incallui.HideCrbt; -@HookExpand(pkg = "com.android.incallui", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.incallui", isPad = false, tarAndroid = 33) public class InCallUi extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Joyose.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Joyose.java index 3ea68557fa..4f50d87ec8 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Joyose.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Joyose.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.joyose.DisableCloudControl; import com.sevtinge.hyperceiler.module.hook.joyose.EnableGpuTuner; -@HookExpand(pkg = "com.xiaomi.joyose", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.joyose", isPad = false, tarAndroid = 33) public class Joyose extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Lbe.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Lbe.java index 0dda23ff0c..35b5aa6277 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Lbe.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Lbe.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.lbe.DisableClipboardTip; -@HookExpand(pkg = "com.lbe.security.miui", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.lbe.security.miui", isPad = false, tarAndroid = 33) public class Lbe extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java index 09e7c50426..8d596b36c7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java @@ -29,7 +29,7 @@ import java.util.Objects; -@HookExpand(pkg = "com.miui.mediaeditor", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.mediaeditor", isPad = false, tarAndroid = 33) public class MediaEditor extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiCloudService.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiCloudService.java index 6d451eaa35..20b573423a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiCloudService.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiCloudService.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.cloudservice.CloudList; -@HookExpand(pkg = "com.miui.cloudservice", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.cloudservice", isPad = false, tarAndroid = 33) public class MiCloudService extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiLink.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiLink.java index 63fdc78444..d118f93d21 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiLink.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiLink.java @@ -25,7 +25,7 @@ import com.sevtinge.hyperceiler.module.hook.milink.UnlockHMind; import com.sevtinge.hyperceiler.module.hook.milink.UnlockMiShare; -@HookExpand(pkg = "com.milink.service", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.milink.service", isPad = false, tarAndroid = 33) public class MiLink extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSettings.java index f443ca9802..ee987121ad 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSettings.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.misettings.CustomRefreshRate; import com.sevtinge.hyperceiler.module.hook.misettings.ShowMoreFpsList; -@HookExpand(pkg = "com.xiaomi.misettings", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.misettings", isPad = false, tarAndroid = 33) public class MiSettings extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiShare.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiShare.java index 3ef89b50e9..924e4ea6a1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiShare.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiShare.java @@ -23,12 +23,12 @@ import com.sevtinge.hyperceiler.module.hook.mishare.NoAutoTurnOff; import com.sevtinge.hyperceiler.module.hook.mishare.UnlockTurboMode; -@HookExpand(pkg = "com.miui.mishare.connectivity", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.mishare.connectivity", isPad = false, tarAndroid = 33) public class MiShare extends BaseModule { @Override public void handleLoadPackage() { - initHook(NoAutoTurnOff.INSTANCE, mPrefsMap.getBoolean("disable_mishare_auto_off")); - initHook(UnlockTurboMode.INSTANCE, mPrefsMap.getBoolean("unlock_turbo_mode")); + initHook(NoAutoTurnOff.INSTANCE); // 禁用 10 分钟自动关闭 + initHook(UnlockTurboMode.INSTANCE); // 解锁极速传输模式 } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSound.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSound.java index 4f34ccca63..bfd816d4ec 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSound.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiSound.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.misound.IncreaseSamplingRate; -@HookExpand(pkg = "com.miui.misound", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.misound", isPad = false, tarAndroid = 33) public class MiSound extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiWallpaper.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiWallpaper.java index 140dfb4cad..2864fcbfd2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiWallpaper.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MiWallpaper.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.miwallpaper.UnlockSuperWallpaper; -@HookExpand(pkg = "com.miui.miwallpaper", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.miwallpaper", isPad = false, tarAndroid = 33) public class MiWallpaper extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mms.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mms.java index f15d64212c..3acf5320fe 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mms.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mms.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.mms.DisableAd; import com.sevtinge.hyperceiler.module.hook.various.UnlockSuperClipboard; -@HookExpand(pkg = "com.android.mms", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.mms", isPad = false, tarAndroid = 33) public class Mms extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mtb.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mtb.java index 0eb32386fe..ae22020c63 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mtb.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Mtb.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.mtb.BypassAuthentication; import com.sevtinge.hyperceiler.module.hook.mtb.IsUserBuild; -@HookExpand(pkg = "com.xiaomi.mtb", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.mtb", isPad = false, tarAndroid = 33) public class Mtb extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Nfc.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Nfc.java index ebaaf48137..250b0511e4 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Nfc.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Nfc.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.nfc.AllowInformationScreen; import com.sevtinge.hyperceiler.module.hook.nfc.DisableSound; -@HookExpand(pkg = "com.android.nfc", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.nfc", isPad = false, tarAndroid = 33) public class Nfc extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Notes.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Notes.java index 9025043687..5345c4f89d 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Notes.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Notes.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.various.UnlockSuperClipboard; -@HookExpand(pkg = "com.miui.notes", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.notes", isPad = false, tarAndroid = 33) public class Notes extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/PackageInstaller.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/PackageInstaller.java index 8fa1fd29ce..e30a8bc725 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/PackageInstaller.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/PackageInstaller.java @@ -31,7 +31,7 @@ import com.sevtinge.hyperceiler.module.hook.packageinstaller.InstallRiskDisable; import com.sevtinge.hyperceiler.module.hook.packageinstaller.InstallSource; -@HookExpand(pkg = "com.miui.packageinstaller", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.packageinstaller", isPad = false, tarAndroid = 33) public class PackageInstaller extends BaseModule { public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/PersonalAssistant.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/PersonalAssistant.java index 405c69f621..859deee3da 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/PersonalAssistant.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/PersonalAssistant.java @@ -18,15 +18,13 @@ */ package com.sevtinge.hyperceiler.module.app; -import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; - import com.sevtinge.hyperceiler.module.base.BaseModule; import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.personalassistant.BlurPersonalAssistant; import com.sevtinge.hyperceiler.module.hook.personalassistant.BlurPersonalAssistantBackGround; import com.sevtinge.hyperceiler.module.hook.personalassistant.EnableFoldWidget; -@HookExpand(pkg = "com.miui.personalassistant", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.personalassistant", isPad = false, tarAndroid = 33) public class PersonalAssistant extends BaseModule { @Override @@ -34,10 +32,10 @@ public void handleLoadPackage() { // initHook(new BlurOverlay(), false); initHook(new EnableFoldWidget(), mPrefsMap.getBoolean("personal_assistant_fold_widget_enable")); - if (mPrefsMap.getStringAsInt("personal_assistant_value", 0) == 2 && !isAndroidVersion(30)) { - initHook(BlurPersonalAssistant.INSTANCE); - } else if (mPrefsMap.getStringAsInt("personal_assistant_value", 0) == 1 && !isAndroidVersion(30)) { - initHook(BlurPersonalAssistantBackGround.INSTANCE); + if (mPrefsMap.getStringAsInt("personal_assistant_value", 0) == 2) { + initHook(BlurPersonalAssistant.INSTANCE , true); + } else if (mPrefsMap.getStringAsInt("personal_assistant_value", 0) == 1) { + initHook(BlurPersonalAssistantBackGround.INSTANCE, true); } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Phone.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Phone.java index c2ebdcea64..abaaa3b06c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Phone.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Phone.java @@ -29,7 +29,7 @@ import com.sevtinge.hyperceiler.module.hook.phone.N5N8BandPhone; import com.sevtinge.hyperceiler.module.hook.phone.ViceSlotVolteButton; -@HookExpand(pkg = "com.android.phone", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.phone", isPad = false, tarAndroid = 33) public class Phone extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/PowerKeeper.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/PowerKeeper.java index 51b1f38344..d3ee22895a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/PowerKeeper.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/PowerKeeper.java @@ -26,7 +26,7 @@ import com.sevtinge.hyperceiler.module.hook.powerkeeper.LockMaxFps; import com.sevtinge.hyperceiler.module.hook.powerkeeper.PreventBatteryWitelist; -@HookExpand(pkg = "com.miui.powerkeeper", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.powerkeeper", isPad = false, tarAndroid = 33) public class PowerKeeper extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Scanner.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Scanner.java index b669f3dd1c..d01620ce14 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Scanner.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Scanner.java @@ -28,7 +28,7 @@ import com.sevtinge.hyperceiler.module.hook.scanner.document.EnableExcel; import com.sevtinge.hyperceiler.module.hook.scanner.document.EnablePpt; -@HookExpand(pkg = "com.xiaomi.scanner", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.scanner", isPad = false, tarAndroid = 33) public class Scanner extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenRecorder.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenRecorder.java index a3051850b0..b80a84fe00 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenRecorder.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenRecorder.java @@ -25,7 +25,7 @@ import com.sevtinge.hyperceiler.module.hook.screenrecorder.ScreenRecorderConfig; import com.sevtinge.hyperceiler.module.hook.screenrecorder.UnlockMoreVolumeFromNew; -@HookExpand(pkg = "com.miui.screenrecorder", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.screenrecorder", isPad = false, tarAndroid = 33) public class ScreenRecorder extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenShot.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenShot.java index fedf277686..887e3e1ac2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenShot.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenShot.java @@ -28,7 +28,7 @@ import com.sevtinge.hyperceiler.module.hook.screenshot.UnlockPrivacyMarking; import com.sevtinge.hyperceiler.module.hook.various.UnlockSuperClipboard; -@HookExpand(pkg = "com.miui.screenshot", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.screenshot", isPad = false, tarAndroid = 33) public class ScreenShot extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SecurityCenter.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SecurityCenter/SecurityCenterT.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/module/app/SecurityCenter.java rename to app/src/main/java/com/sevtinge/hyperceiler/module/app/SecurityCenter/SecurityCenterT.java index 9341c8b0b0..15b977dae3 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SecurityCenter.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SecurityCenter/SecurityCenterT.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.module.app; +package com.sevtinge.hyperceiler.module.app.SecurityCenter; import android.os.Build; @@ -69,8 +69,8 @@ import com.sevtinge.hyperceiler.module.hook.securitycenter.sidebar.video.VBVideoMode; import com.sevtinge.hyperceiler.module.hook.securitycenter.sidebar.video.VideoDolbyOpen; -@HookExpand(pkg = "com.miui.securitycenter", isPad = false, tarAndroid = 34) -public class SecurityCenter extends BaseModule { +@HookExpand(pkg = "com.miui.securitycenter", isPad = false, tarAndroid = 33) +public class SecurityCenterT extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkT.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework.java rename to app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkT.java index 4ebc82ae42..adcbbcfd5a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkT.java @@ -16,11 +16,10 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.module.app; +package com.sevtinge.hyperceiler.module.app.SystemFramework.Phone; import static com.sevtinge.hyperceiler.utils.api.VoyagerApisKt.isPad; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion; -import static com.sevtinge.hyperceiler.utils.log.LogManager.logLevelDesc; import com.sevtinge.hyperceiler.module.base.BaseModule; import com.sevtinge.hyperceiler.module.base.HookExpand; @@ -80,15 +79,11 @@ import com.sevtinge.hyperceiler.module.hook.systemframework.network.N5N8Band; import com.sevtinge.hyperceiler.module.hook.various.NoAccessDeviceLogsRequest; -import de.robv.android.xposed.XposedBridge; - -@HookExpand(pkg = "android", isPad = false, tarAndroid = 34) -public class SystemFramework extends BaseModule { +@HookExpand(pkg = "android", isPad = false, tarAndroid = 33) +public class SystemFrameworkT extends BaseModule { @Override public void handleLoadPackage() { - XposedBridge.log("[HyperCeiler][I]: Log level is " + logLevelDesc()); - // 小窗 initHook(new FreeFormCount(), mPrefsMap.getBoolean("system_framework_freeform_count")); initHook(new FreeformBubble(), mPrefsMap.getBoolean("system_framework_freeform_bubble")); @@ -101,7 +96,7 @@ public void handleLoadPackage() { // initHook(new OpenAppInFreeForm(), mPrefsMap.getBoolean("system_framework_freeform_jump")); // 音量 - initHook(new VolumeDefaultStream()); + initHook(new VolumeDefaultStream(), true); initHook(new VolumeFirstPress(), mPrefsMap.getBoolean("system_framework_volume_first_press")); initHook(new VolumeSeparateControl(), mPrefsMap.getBoolean("system_framework_volume_separate_control")); initHook(new VolumeSteps(), mPrefsMap.getInt("system_framework_volume_steps", 0) > 0); @@ -148,8 +143,7 @@ public void handleLoadPackage() { } // 核心破解 - if (isMoreAndroidVersion(33)) - initHook(BypassSignCheckForT.INSTANCE, mPrefsMap.getBoolean("system_framework_core_patch_auth_creak") || mPrefsMap.getBoolean("system_framework_core_patch_disable_integrity")); + initHook(BypassSignCheckForT.INSTANCE, mPrefsMap.getBoolean("system_framework_core_patch_auth_creak") || mPrefsMap.getBoolean("system_framework_core_patch_disable_integrity")); // 网络 initHook(DualNRSupport.INSTANCE, mPrefsMap.getBoolean("phone_double_5g_nr")); @@ -159,7 +153,7 @@ public void handleLoadPackage() { initHook(N28Band.INSTANCE, mPrefsMap.getBoolean("phone_n28")); // Other - initHook(new PackagePermissions()); + initHook(new PackagePermissions(), true); initHook(new RotationButton(), mPrefsMap.getStringAsInt("system_framework_other_rotation_button_int", 0) == 2); initHook(new GlobalActions(), mLoadPackageParam.processName.equals("android")); initHook(new ThermalBrightness(), mPrefsMap.getBoolean("system_framework_other_thermal_brightness")); diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemSettings/Phone/SystemSettingsT.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemSettings/Phone/SystemSettingsT.java index bdb8895377..554d67dadf 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemSettings/Phone/SystemSettingsT.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.module.app; +package com.sevtinge.hyperceiler.module.app.SystemSettings.Phone; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; @@ -53,8 +53,8 @@ import com.sevtinge.hyperceiler.module.hook.systemsettings.aiimage.UnlockMemc; import com.sevtinge.hyperceiler.module.hook.systemsettings.aiimage.UnlockSuperResolution; -@HookExpand(pkg = "com.android.settings", isPad = false, tarAndroid = 34) -public class SystemSettings extends BaseModule { +@HookExpand(pkg = "com.android.settings", isPad = false, tarAndroid = 33) +public class SystemSettingsT extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI/Phone/SystemUIT.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI.java rename to app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI/Phone/SystemUIT.java index d87e706259..db0f0307cc 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI/Phone/SystemUIT.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.module.app; +package com.sevtinge.hyperceiler.module.app.SystemUI.Phone; import static com.sevtinge.hyperceiler.utils.api.NekoQiqiApisKt.isNewNetworkStyle; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; @@ -138,12 +138,12 @@ import java.util.Objects; -@HookExpand(pkg = "com.android.systemui", isPad = false, tarAndroid = 34) -public class SystemUI extends BaseModule { +@HookExpand(pkg = "com.android.systemui", isPad = false, tarAndroid = 33) +public class SystemUIT extends BaseModule { @Override public void handleLoadPackage() { // PluginHelper - initHook(new PluginHelper()); + initHook(new PluginHelper(), true); // 充电动画 initHook(new ChargeAnimationStyle(), mPrefsMap.getStringAsInt("system_ui_charge_animation_style", 0) > 0); // initHook(DisableChargeAnimation.INSTANCE); @@ -162,8 +162,8 @@ public void handleLoadPackage() { mPrefsMap.getBoolean("system_ui_status_bar_icon_mobile_network_hide_card_2")) && !mPrefsMap.getBoolean("system_ui_statusbar_network_icon_enable") && !isMoreHyperOSVersion(1f); - initHook(new StatusBarIcon()); - initHook(new IconsFromSystemManager()); + initHook(new StatusBarIcon(), true); + initHook(new IconsFromSystemManager(), true); initHook(new UnlockCustomActions(), mPrefsMap.getBoolean("system_ui_control_center_media_control_unlock_custom_actions")); initHook(new MediaButton(), mPrefsMap.getInt("system_ui_control_center_media_control_media_button", 140) != 140 || mPrefsMap.getInt("system_ui_control_center_media_control_media_button_custom", 140) != 140); @@ -215,11 +215,11 @@ public void handleLoadPackage() { if (!isNewNetworkStyle()) { initHook(NetworkSpeed.INSTANCE, !isMoreAndroidVersion(34)); initHook(NetworkSpeedWidth.INSTANCE, mPrefsMap.getInt("system_ui_statusbar_network_speed_fixedcontent_width", 10) > 10); - initHook(NetworkSpeedStyle.INSTANCE); + initHook(NetworkSpeedStyle.INSTANCE, true); initHook(StatusBarNoNetSpeedSep.INSTANCE, mPrefsMap.getBoolean("system_ui_status_bar_no_netspeed_separator")); } else { - initHook(NewNetworkSpeed.INSTANCE); - initHook(NewNetworkSpeedStyle.INSTANCE); + initHook(NewNetworkSpeed.INSTANCE, true); + initHook(NewNetworkSpeedStyle.INSTANCE, true); } initHook(new NetworkSpeedSpacing(), mPrefsMap.getInt("system_ui_statusbar_network_speed_update_spacing", 3) != 3); initHook(new NetworkSpeedSec(), mPrefsMap.getBoolean("system_ui_statusbar_network_speed_sec_unit")); @@ -324,7 +324,7 @@ public void handleLoadPackage() { initHook(DisableDeviceManaged.INSTANCE, mPrefsMap.getBoolean("system_ui_control_center_disable_device_managed")); // Actions - initHook(new StatusBarActions()); + initHook(new StatusBarActions(), true); // Other initHook(new UiLockApp(), mPrefsMap.getBoolean("system_framework_guided_access")); diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ThemeManager.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ThemeManager.java index f128e6b49a..9a5deda381 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ThemeManager.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ThemeManager.java @@ -25,7 +25,7 @@ import com.sevtinge.hyperceiler.module.hook.thememanager.EnablePadTheme; import com.sevtinge.hyperceiler.module.hook.thememanager.VersionCodeModify; -@HookExpand(pkg = "com.android.thememanager", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.thememanager", isPad = false, tarAndroid = 33) public class ThemeManager extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/TrustService.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/TrustService.java index 3ceaf44dbd..f0902a1def 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/TrustService.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/TrustService.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.trustservice.DisableMrm; -@HookExpand(pkg = "com.xiaomi.trustservice", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.xiaomi.trustservice", isPad = false, tarAndroid = 33) public class TrustService extends BaseModule { @Override public void handleLoadPackage() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/TsmClient.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/TsmClient.java index e90d9f169d..0ef2dea900 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/TsmClient.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/TsmClient.java @@ -22,7 +22,7 @@ import com.sevtinge.hyperceiler.module.base.HookExpand; import com.sevtinge.hyperceiler.module.hook.tsmclient.AutoNfc; -@HookExpand(pkg = "com.miui.tsmclient", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.tsmclient", isPad = false, tarAndroid = 33) public class TsmClient extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Updater.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Updater.java index 8aa1ebaae4..e28c24b9eb 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Updater.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Updater.java @@ -29,14 +29,14 @@ import com.sevtinge.hyperceiler.module.hook.updater.VersionCodeModify; import com.sevtinge.hyperceiler.module.hook.updater.VersionCodeNew; -@HookExpand(pkg = "com.android.updater", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.android.updater", isPad = false, tarAndroid = 33) public class Updater extends BaseModule { @Override public void handleLoadPackage() { if (mPrefsMap.getBoolean("updater_enable_miui_version")) { if (mPrefsMap.getStringAsInt("updater_version_mode", 1) != 1) { - initHook(VersionCodeNew.INSTANCE); + initHook(VersionCodeNew.INSTANCE, true); } else { initHook(new VersionCodeModify(), !TextUtils.isEmpty(mPrefsMap.getString("various_updater_miui_version", ""))); } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousSystemApps.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousSystemApps.java index 612963929c..b6bd5f57b6 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousSystemApps.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousSystemApps.java @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.HashSet; -@HookExpand(pkg = "VariousSystemApps", isPad = false, tarAndroid = 34, skip = true) +@HookExpand(pkg = "VariousSystemApps", isPad = false, tarAndroid = 33, skip = true) public class VariousSystemApps extends BaseModule { Class mHelpers; String mPackageName; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousThirdApps.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousThirdApps.java index 5cbe588cec..2e1d4afac9 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousThirdApps.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/VariousThirdApps.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; -@HookExpand(pkg = "VariousThirdApps", isPad = false, tarAndroid = 34, skip = true) +@HookExpand(pkg = "VariousThirdApps", isPad = false, tarAndroid = 33, skip = true) public class VariousThirdApps extends BaseModule { String mPackageName; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/VoiceAssist.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/VoiceAssist.java index f465571546..744ddd035d 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/VoiceAssist.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/VoiceAssist.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.voiceassist.DisableChatWatermark; import com.sevtinge.hyperceiler.module.hook.voiceassist.UseThirdPartyBrowser; -@HookExpand(pkg = "com.miui.voiceassist", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.voiceassist", isPad = false, tarAndroid = 33) public class VoiceAssist extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Weather.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Weather.java index 27fc0cbab2..d458287d9d 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Weather.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Weather.java @@ -23,7 +23,7 @@ import com.sevtinge.hyperceiler.module.hook.weather.SetCardLightDarkMode; import com.sevtinge.hyperceiler.module.hook.weather.SetDeviceLevel; -@HookExpand(pkg = "com.miui.weather2", isPad = false, tarAndroid = 34) +@HookExpand(pkg = "com.miui.weather2", isPad = false, tarAndroid = 33) public class Weather extends BaseModule { @Override diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseHook.java b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseHook.java index 70e7b97282..24ad542055 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseHook.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseHook.java @@ -32,6 +32,10 @@ public abstract class BaseHook extends HookTool { public static final XmlTool mXmlTool = BaseXposedInit.mXmlTool; public static final String ACTION_PREFIX = "com.sevtinge.hyperceiler.module.action."; + public boolean isLoad() { + return false; + } + public abstract void init() throws NoSuchMethodException; public void onCreate(LoadPackageParam lpparam) { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseModule.java b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseModule.java index 500c3f55ec..065e6f81d2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseModule.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseModule.java @@ -87,7 +87,9 @@ public void initZygote() { } public void initHook(BaseHook baseHook) { - initHook(baseHook, true); + if (baseHook.isLoad()) { + baseHook.onCreate(mLoadPackageParam); + } } public void initHook(BaseHook baseHook, boolean isInit) { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseXposedInit.java b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseXposedInit.java index 4ffcb19c0e..5776f1d423 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseXposedInit.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseXposedInit.java @@ -46,7 +46,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; import java.util.Enumeration; import java.util.Map; import java.util.Objects; @@ -188,6 +187,10 @@ private boolean invokeHookInit(LoadPackageParam lpparam) { int android = hookExpand.tarAndroid(); boolean skip = hookExpand.skip(); if (skip) continue; + if (mPkgName.equals("android")) { + XposedBridge.log("[HyperCeiler][I]: Log level is " + logLevelDesc()); + continue; + } if (mPkgName.equals(mPkg)) { // 需要限制安卓版本和设备取消这些注释,并删除下面的invoke方法。 // if (!isAndroidVersion(android)) continue; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/NoAutoTurnOff.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/NoAutoTurnOff.kt index 0c6be7a724..4fdb7dc751 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/NoAutoTurnOff.kt +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/NoAutoTurnOff.kt @@ -21,12 +21,12 @@ package com.sevtinge.hyperceiler.module.hook.mishare import com.github.kyuubiran.ezxhelper.EzXHelper.safeClassLoader import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createHook import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createHooks -import com.sevtinge.hyperceiler.module.base.BaseHook +import com.sevtinge.hyperceiler.module.base.* import com.sevtinge.hyperceiler.module.base.dexkit.DexKit.addUsingStringsEquals import com.sevtinge.hyperceiler.module.base.dexkit.DexKit.dexKitBridge -import com.sevtinge.hyperceiler.utils.getObjectField -import de.robv.android.xposed.XposedHelpers -import java.lang.reflect.Modifier +import com.sevtinge.hyperceiler.utils.* +import de.robv.android.xposed.* +import java.lang.reflect.* object NoAutoTurnOff : BaseHook() { private val nullMethod by lazy { @@ -88,6 +88,10 @@ object NoAutoTurnOff : BaseHook() { }.singleOrNull()?.getFieldInstance(safeClassLoader) } + override fun isLoad(): Boolean { + return mPrefsMap.getBoolean("disable_mishare_auto_off") + } + override fun init() { // 禁用小米互传功能自动关闭部分 runCatching { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/UnlockTurboMode.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/UnlockTurboMode.kt index ffd045a809..a208efe3d1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/UnlockTurboMode.kt +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mishare/UnlockTurboMode.kt @@ -18,9 +18,9 @@ */ package com.sevtinge.hyperceiler.module.hook.mishare -import com.github.kyuubiran.ezxhelper.EzXHelper +import com.github.kyuubiran.ezxhelper.* import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createHook -import com.sevtinge.hyperceiler.module.base.BaseHook +import com.sevtinge.hyperceiler.module.base.* import com.sevtinge.hyperceiler.module.base.dexkit.DexKit.addUsingStringsEquals import com.sevtinge.hyperceiler.module.base.dexkit.DexKit.dexKitBridge @@ -33,6 +33,10 @@ object UnlockTurboMode : BaseHook() { }.single().getMethodInstance(EzXHelper.safeClassLoader) } + override fun isLoad(): Boolean { + return mPrefsMap.getBoolean("unlock_turbo_mode") + } + override fun init() { turboModeMethod.createHook { returnConstant(true) diff --git a/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java b/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java index 5e0c6d493e..df11bc661c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java @@ -35,13 +35,14 @@ import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; public class SearchHelper { public static final int MARK_COLOR_VIBRANT = Color.rgb(255, 0, 0); public static final String NEW_MODS_SEARCH_QUERY = "\uD83C\uDD95"; - public static ArrayList allModsList = new ArrayList<>(); + public static List allModsList = new ArrayList<>(); public static String TAG = "SearchHelper"; @@ -334,9 +335,6 @@ public static void getAllMods(Context context, boolean force) { parsePrefXml(context, R.xml.getapps, "com.sevtinge.hyperceiler.ui.fragment.MarketFragment"); - parsePrefXml(context, R.xml.mirror, - "com.sevtinge.hyperceiler.ui.fragment.MirrorFragment"); - parsePrefXml(context, R.xml.mtb, "com.sevtinge.hyperceiler.ui.fragment.MtbFragment");