From eefca8ef641be34b7247b84a88f4caabbac3d30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=B8=90=E7=A6=BB?= Date: Wed, 15 Dec 2021 13:22:00 +0800 Subject: [PATCH 1/5] Add codename for API31 --- .../org/meowcat/edxposed/manager/StatusInstallerFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java index 2ee3f13d..a33b8392 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java @@ -322,6 +322,8 @@ private String getAndroidVersion() { return "Quince Tart"; case 30: return "Red Velvet Cake"; + case 31: + return "Snow Cone"; } return "Unknown"; } @@ -334,7 +336,7 @@ private String getUIFramework() { manufacturer += " " + Build.MODEL + " "; if (new File("/system/framework/framework-miui-res.apk").exists() || new File("/system/app/miui/miui.apk").exists() || new File("/system/app/miuisystem/miuisystem.apk").exists()) { manufacturer += "(MIUI)"; - } else if (new File("/system/priv-app/oneplus-framework-res/oneplus-framework-res.apk").exists()) { + } else if (new File("/system/priv-app/oneplus-framework-res/oneplus-framework-res.apk").exists() || new File("/system/framework/oplus-framework.jar").exists()) { manufacturer += "(Hydrogen/Oxygen OS)"; } else if (new File("/system/framework/oppo-framework.jar").exists() || new File("/system/framework/oppo-framework-res.apk").exists() || new File("/system/framework/coloros-framework.jar").exists() || new File("/system/framework/coloros.services.jar").exists() || new File("/system/framework/oppo-services.jar").exists() || new File("/system/framework/coloros-support-wrapper.jar").exists()) { manufacturer += "(Color OS)"; From c98deffa49c49715c47daa3a0770a6de124df0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=B8=90=E7=A6=BB?= Date: Wed, 15 Dec 2021 13:23:33 +0800 Subject: [PATCH 2/5] Fix indent --- .../org/meowcat/edxposed/manager/StatusInstallerFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java index a33b8392..e8ffc60a 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java @@ -323,7 +323,7 @@ private String getAndroidVersion() { case 30: return "Red Velvet Cake"; case 31: - return "Snow Cone"; + return "Snow Cone"; } return "Unknown"; } From 56faaffb8b8992bbb24341b2f31a2217be93d890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=AF=85=E5=8D=9A?= Date: Wed, 15 Dec 2021 13:40:19 +0800 Subject: [PATCH 3/5] Change OS Framework name --- .../meowcat/edxposed/manager/StatusInstallerFragment.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java index e8ffc60a..876db95f 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java @@ -336,8 +336,10 @@ private String getUIFramework() { manufacturer += " " + Build.MODEL + " "; if (new File("/system/framework/framework-miui-res.apk").exists() || new File("/system/app/miui/miui.apk").exists() || new File("/system/app/miuisystem/miuisystem.apk").exists()) { manufacturer += "(MIUI)"; - } else if (new File("/system/priv-app/oneplus-framework-res/oneplus-framework-res.apk").exists() || new File("/system/framework/oplus-framework.jar").exists()) { - manufacturer += "(Hydrogen/Oxygen OS)"; + } else if (new File("/system/priv-app/oneplus-framework-res/oneplus-framework-res.apk").exists()) { + manufacturer += "(HydrogenOS/OxygenOS)"; + } else if (new File("/system/framework/oplus-framework.jar").exists()) { + manufacturer += "(ColorOS/OxygenOS/RealmeUI)"; } else if (new File("/system/framework/oppo-framework.jar").exists() || new File("/system/framework/oppo-framework-res.apk").exists() || new File("/system/framework/coloros-framework.jar").exists() || new File("/system/framework/coloros.services.jar").exists() || new File("/system/framework/oppo-services.jar").exists() || new File("/system/framework/coloros-support-wrapper.jar").exists()) { manufacturer += "(Color OS)"; } else if (new File("/system/framework/hwEmui.jar").exists() || new File("/system/framework/hwcustEmui.jar").exists() || new File("/system/framework/hwframework.jar").exists() || new File("/system/framework/framework-res-hwext.apk").exists() || new File("/system/framework/hwServices.jar").exists() || new File("/system/framework/hwcustframework.jar").exists()) { From c0dae92dd1fdcd2497bd2ef0ba395e7250eef01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=AF=85=E5=8D=9A?= Date: Wed, 15 Dec 2021 13:41:02 +0800 Subject: [PATCH 4/5] Fix Indent --- .../org/meowcat/edxposed/manager/StatusInstallerFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java index 876db95f..73fce31d 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java @@ -339,7 +339,7 @@ private String getUIFramework() { } else if (new File("/system/priv-app/oneplus-framework-res/oneplus-framework-res.apk").exists()) { manufacturer += "(HydrogenOS/OxygenOS)"; } else if (new File("/system/framework/oplus-framework.jar").exists()) { - manufacturer += "(ColorOS/OxygenOS/RealmeUI)"; + manufacturer += "(ColorOS/OxygenOS/RealmeUI)"; } else if (new File("/system/framework/oppo-framework.jar").exists() || new File("/system/framework/oppo-framework-res.apk").exists() || new File("/system/framework/coloros-framework.jar").exists() || new File("/system/framework/coloros.services.jar").exists() || new File("/system/framework/oppo-services.jar").exists() || new File("/system/framework/coloros-support-wrapper.jar").exists()) { manufacturer += "(Color OS)"; } else if (new File("/system/framework/hwEmui.jar").exists() || new File("/system/framework/hwcustEmui.jar").exists() || new File("/system/framework/hwframework.jar").exists() || new File("/system/framework/framework-res-hwext.apk").exists() || new File("/system/framework/hwServices.jar").exists() || new File("/system/framework/hwcustframework.jar").exists()) { From 0a8c79f52f5d4607455c3a4cd217b51eee56c1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=AF=85=E5=8D=9A?= Date: Wed, 15 Dec 2021 14:01:06 +0800 Subject: [PATCH 5/5] All oplus in one --- .../org/meowcat/edxposed/manager/StatusInstallerFragment.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java index 73fce31d..fd7ec8f5 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java @@ -338,10 +338,8 @@ private String getUIFramework() { manufacturer += "(MIUI)"; } else if (new File("/system/priv-app/oneplus-framework-res/oneplus-framework-res.apk").exists()) { manufacturer += "(HydrogenOS/OxygenOS)"; - } else if (new File("/system/framework/oplus-framework.jar").exists()) { + } else if (new File("/system/framework/oppo-framework.jar").exists() || new File("/system/framework/oppo-framework-res.apk").exists() || new File("/system/framework/coloros-framework.jar").exists() || new File("/system/framework/coloros.services.jar").exists() || new File("/system/framework/oppo-services.jar").exists() || new File("/system/framework/coloros-support-wrapper.jar").exists() || new File("/system/framework/oplus-framework.jar").exists()) { manufacturer += "(ColorOS/OxygenOS/RealmeUI)"; - } else if (new File("/system/framework/oppo-framework.jar").exists() || new File("/system/framework/oppo-framework-res.apk").exists() || new File("/system/framework/coloros-framework.jar").exists() || new File("/system/framework/coloros.services.jar").exists() || new File("/system/framework/oppo-services.jar").exists() || new File("/system/framework/coloros-support-wrapper.jar").exists()) { - manufacturer += "(Color OS)"; } else if (new File("/system/framework/hwEmui.jar").exists() || new File("/system/framework/hwcustEmui.jar").exists() || new File("/system/framework/hwframework.jar").exists() || new File("/system/framework/framework-res-hwext.apk").exists() || new File("/system/framework/hwServices.jar").exists() || new File("/system/framework/hwcustframework.jar").exists()) { manufacturer += "(EMUI)"; } else if (new File("/system/framework/com.samsung.device.jar").exists() || new File("/system/framework/sec_platform_library.jar").exists()) {