From 2cf521fc258b224b6569c1cbe0af3d398271e4ec Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Sun, 2 Jun 2019 15:59:39 +0200
Subject: [PATCH] update openScale to version 2.1.0

---
 android_app/app/build.gradle                                  | 4 ++--
 .../com/health/openscale/core/bluetooth/BluetoothFactory.java | 4 ++--
 .../health/openscale/gui/views/MeasurementViewSettings.java   | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index a3fe27fc..485fe30e 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -7,8 +7,8 @@ android {
         testApplicationId "com.health.openscale.test"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 44
-        versionName "2.0.3"
+        versionCode 45
+        versionName "2.1.0"
 
         manifestPlaceholders = [
                 appIcon: "@drawable/ic_launcher_openscale"
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
index f7189a19..a2688a22 100644
--- 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
@@ -40,14 +40,14 @@ public class BluetoothFactory {
                 || name.equals("BF700".toLowerCase(Locale.US))) {
             return new BluetoothBeurerSanitas(context, BluetoothBeurerSanitas.DeviceType.BEURER_BF710);
         }
-        if (name.startsWith("BEURER BF600".toLowerCase(Locale.US))
+        /*if (name.startsWith("BEURER BF600".toLowerCase(Locale.US))
                 || name.startsWith("BEURER BF850".toLowerCase(Locale.US))
                 || name.startsWith("BF600".toLowerCase(Locale.US))
                 || name.startsWith("BF850".toLowerCase(Locale.US))
                 || name.startsWith("BF-600".toLowerCase(Locale.US))
                 || name.startsWith("BF-850".toLowerCase(Locale.US))) {
             return new BluetoothStandardWeightProfile(context);
-        }
+        }*/
         if (name.equals("openScale".toLowerCase(Locale.US))) {
             return new BluetoothCustomOpenScale(context);
         }
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementViewSettings.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementViewSettings.java
index 4fa899a5..b2256203 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementViewSettings.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementViewSettings.java
@@ -66,6 +66,7 @@ public class MeasurementViewSettings {
             case Caliper2MeasurementView.KEY:
             case Caliper3MeasurementView.KEY:
             case CaloriesMeasurementView.KEY:
+            case UserMeasurementView.KEY:
                 defaultValue = false;
                 break;
             default: