From 0c3d7f1d7343fcc294ba9e1dd270170f71ec2707 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 28 Sep 2022 17:45:01 +0300
Subject: [PATCH] fixes detection

---
 .../main/java/ru/vtosters/lite/deviceinfo/Device.java  |  6 +++---
 .../java/ru/vtosters/lite/deviceinfo/OEMDetector.java  |  3 +--
 .../java/ru/vtosters/lite/ui/fragments/SystemInfo.java | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java b/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java
index eca3dd6f3..3500ed99b 100644
--- a/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java
+++ b/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java
@@ -2,7 +2,7 @@ package ru.vtosters.lite.deviceinfo;
 
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isEMUI;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isMIUI;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isMIUIAlter;
+import static ru.vtosters.lite.deviceinfo.OEMDetector.hasMiuiIncrCode;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isSamsung;
 import static ru.vtosters.lite.utils.About.getBuildNumber;
 
@@ -97,8 +97,8 @@ public class Device {
                 + "', brandName='" + this.brandName
                 + (isMIUI() ? "', MiuiUiVersionCode='" + this.MiuiUiVersionCode + "', MiuiUiVersionName='" + this.MiuiUiVersionName : "")
                 + (isSamsung() ? "', OneUiMajorVersion='" + this.OneUiMajorVersion + "', OneUiMinorVersion='" + this.OneUiMinorVersion : "")
-                + (isMIUIAlter() ? "', MiuiUiVersionIncrementalCode='" + this.MiuiIncrementalCode : "")
-                + (isEMUI() ? "', MiuiUiVersionIncrementalCode='" + this.EmuiVersion : "")
+                + (hasMiuiIncrCode() ? "', MiuiUiVersionIncrementalCode='" + this.MiuiIncrementalCode : "")
+                + (isEMUI() ? "', EmuiVersion='" + this.EmuiVersion : "")
                 + "', modelName='" + this.modelName + "'";
     }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java b/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java
index 45f4ac0fe..4610c69dc 100644
--- a/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java
+++ b/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java
@@ -12,7 +12,6 @@ import android.text.TextUtils;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ReflectionUtils;
 
 public class OEMDetector {
@@ -83,7 +82,7 @@ public class OEMDetector {
                 || isIntentResolved(ctx, new Intent().setComponent(new ComponentName("com.miui.securitycenter", "com.miui.powercenter.PowerSettings")));
     }
 
-    public static boolean isMIUIAlter() {
+    public static boolean hasMiuiIncrCode() {
         return !TextUtils.isEmpty(getMiuiUiVersionIncrementalCode()) && isMIUI();
     }
 
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java
index e52572dba..a1882760e 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java
@@ -10,7 +10,7 @@ import static ru.vtosters.lite.deviceinfo.OEMDetector.getOneUiMinorVersion;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isEMUI;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isFlyme;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isMIUI;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isMIUIAlter;
+import static ru.vtosters.lite.deviceinfo.OEMDetector.hasMiuiIncrCode;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isOneUi;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isSamsung;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isVivo;
@@ -64,7 +64,7 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment {
         var isVivo = isVivo();
         var isZenUI = isZenUI();
         var isEMUI = isEMUI();
-        var isMIUIAlter = isMIUIAlter();
+        var hasMiuiIncrCode = hasMiuiIncrCode();
 
         var isValidSignature = isValidSignature();
         var isTablet = isTablet();
@@ -158,7 +158,7 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment {
                 return false;
             });
 
-            if (isMIUIAlter) {
+            if (hasMiuiIncrCode) {
                 addPreference(this, "", "miuiIncrementalCodeName", miuiIncrementalCodeName, null, preference -> {
                     ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", miuiIncrementalCodeName));
                     sendToast(AndroidUtils.getString("copied_to_clipboard"));
@@ -181,10 +181,10 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment {
 
         addPreference(this, "", "isMiui", "Value: " + isMiui, null, null);
 
-        addPreference(this, "", "isEMUI", "Value: " + isEMUI, null, null);
-
         addPreference(this, "", "isMIUIDetectionV2", "Value: " + isMIUIDetectionV2, null, null);
 
+        addPreference(this, "", "isEMUI", "Value: " + isEMUI, null, null);
+
         addPreference(this, "", "isFlyme", "Value: " + isFlyme, null, null);
 
         addPreference(this, "", "isSamsung", "Value: " + isSamsung, null, null);