y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes detection

Browse Source
This commit is contained in:
gdlbo
2022-09-28 17:45:01 +03:00
parent 576999b582
commit 0c3d7f1d73
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java
+3 -3
View File
@@ -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 + "'";
}
}
app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java
+1 -2
View File
@@ -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();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java
+5 -5
View File
@@ -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);