Revert "Support for nameless OKOK scales (Myria MY4836) (#1081)"

This reverts commit 29dd632.
oliexdev · Nov 17, 2024 · f8f8669 · f8f8669
1 parent 29dd632
commit f8f8669
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 208 deletions.
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java
@@ -82,7 +82,7 @@ public static BluetoothCommunication createDeviceDriver(Context context, String
         if (name.equals("Health Scale".toLowerCase(Locale.US))) {
             return new BluetoothOneByone(context);
         }
-        if(name.equals("1byone scale".toLowerCase(Locale.US))) {
+        if(name.equals("1byone scale".toLowerCase(Locale.US))){
             return new BluetoothOneByoneNew(context);
         }
 
@@ -114,13 +114,10 @@ public static BluetoothCommunication createDeviceDriver(Context context, String
         }
         if (deviceName.equals("Hoffen BS-8107")) {
             return new BluetoothHoffenBBS8107(context);
-        }
+	      }
         if (deviceName.equals("ADV") || deviceName.equals("Chipsea-BLE")) {
             return new BluetoothOKOK(context);
         }
-        if (deviceName.isEmpty()) {
-            return new BluetoothOKOK2(context);
-        }
         if (deviceName.equals("BF105") || deviceName.equals("BF720")) {
             return new BluetoothBeurerBF105(context);
         }
@@ -133,10 +130,10 @@ public static BluetoothCommunication createDeviceDriver(Context context, String
         if (deviceName.equals("SBF72") || deviceName.equals("BF915") || deviceName.equals("SBF73")) {
             return new BluetoothSanitasSBF72(context, deviceName);
         }
-        if (deviceName.equals("Weight Scale")) {
+        if (deviceName.equals("Weight Scale")){
             return new BluetoothSinocare(context);
         }
-        if (deviceName.equals("CH100")) {
+        if (deviceName.equals("CH100")){
             return new BluetoothHuaweiAH100(context);
         }
         if (deviceName.equals("ES-26BB-B")){
@@ -145,7 +142,7 @@ public static BluetoothCommunication createDeviceDriver(Context context, String
         if (deviceName.equals("Yoda1")){
             return new BluetoothYoda1Scale(context);
         }
-        if (deviceName.equals("AAA002") || deviceName.equals("AAA007")) {
+        if (deviceName.equals("AAA002") || deviceName.equals("AAA007")){
             return new BluetoothBroadcastScale(context);
         }
         return null;

diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOKOK2.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOKOK2.java
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
@@ -17,7 +17,6 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -42,9 +41,6 @@ public class BluetoothPreferences extends PreferenceFragmentCompat {
     private Preference btScanner;
 
     private static final String formatDeviceName(String name, String address) {
-        if (TextUtils.isEmpty(name) && !address.isEmpty()) {
-            return String.format("[%s]", address);
-        }
         if (name.isEmpty() || address.isEmpty()) {
             return "-";
         }

diff --git a/...app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java b/...app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
@@ -42,7 +42,6 @@
 import android.provider.Settings;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
-import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import android.view.Gravity;
@@ -229,9 +228,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     }
 
     private static final String formatDeviceName(String name, String address) {
-        if (TextUtils.isEmpty(name) && !address.isEmpty()) {
-            return String.format("[%s]", address);
-        }
         if (name.isEmpty() || address.isEmpty()) {
             return "-";
         }
@@ -318,15 +314,14 @@ private void onDeviceFound(final ScanResult bleScanResult) {
         BluetoothDevice device = bleScanResult.getDevice();
         Context context = getContext();
 
-        if (foundDevices.containsKey(device.getAddress()) || context == null) {
+        if (device.getName() == null || foundDevices.containsKey(device.getAddress()) || context == null) {
             return;
         }
 
         BluetoothDeviceView deviceView = new BluetoothDeviceView(context);
         deviceView.setDeviceName(formatDeviceName(bleScanResult.getDevice()));
 
-        String name = device.getName() != null ? device.getName() : "";
-        BluetoothCommunication btDevice = BluetoothFactory.createDeviceDriver(context, name);
+        BluetoothCommunication btDevice = BluetoothFactory.createDeviceDriver(context, device.getName());
         if (btDevice != null) {
             Timber.d("Found supported device %s (driver: %s)",
                     formatDeviceName(device), btDevice.driverName());