Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -70,4 +70,5 @@ deploy:
   overwrite: true
   target_commitish: $TRAVIS_COMMIT
   on:
+    all_branches: true
     tags: false

README.md

@@ -21,7 +21,7 @@ Install [openScale-dev-build.apk](https://github.com/oliexdev/openScale/releases
 - Import or export your data from/into a CSV file
 - Estimates body metrics (body fat, body water and lean body mass) based on scientic publications
 - Support for multiple users
-- Partially or full support for custom made Bluetooth scale, Xiaomi Mi scale v1/v2, Sanitas SBF70, Medisana BS444/BS440, Digoo DG-S038H, Yunmai Mini, Excelvan CF369BLE/CF366BLE, Yunmai SE, MGB, Exingtech Y1, Beurer BF700/BF710/BF800, Silvercrest SBF75, Runtastic Libra, Hesley (Yunchen), iHealth HS3, Easy Home 64050, Accuway (see [openScale wiki](https://github.com/oliexdev/openScale/wiki/Supported-scales-in-openScale) for details)
+- Partial or full support for custom made Bluetooth scale, Xiaomi Mi scale v1/v2, Sanitas SBF70, Medisana BS444/BS440, Digoo DG-S038H, Yunmai Mini, Excelvan CF369BLE/CF366BLE, Yunmai SE, MGB, Exingtech Y1, Beurer BF700/BF710/BF800, Silvercrest SBF75, Runtastic Libra, Hesley (Yunchen), iHealth HS3, Easy Home 64050, Accuway, Trisa Body Analyze 4.0 (see [openScale wiki](https://github.com/oliexdev/openScale/wiki/Supported-scales-in-openScale) for details)
 - Partially or full translated into Brazilian Portuguese, Catalan, Chinese (traditional), Croatian, Czech, Danish, Dutch, English, French, Galician, German, Greek, Hebrew, Italian, Japanese, Norwegian Bokmål, Polish, Romanian, Russian, Slovak, Slovenian, Spanish, Swedish, Turkish
 - No advertising and for free
 - All data belongs to you (no cloud service)

android_app/app/src/main/java/com/health/openscale/core/bluetooth/lib/TrisaBodyAnalyzeLib.java

@@ -19,12 +19,8 @@ import android.support.annotation.Nullable;
 
 import com.health.openscale.core.datatypes.ScaleMeasurement;
 
-import java.time.Clock;
 import java.util.Date;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 /**
  * Class with static helper methods. This is a separate class for testing purposes.
  *

android_app/app/src/main/res/values-iw/strings.xml

@@ -248,4 +248,11 @@
     <string name="activity_level_heavy">גבוהה</string>
     <string name="activity_level_extreme">קיצונית</string>
     <string name="label_data_provider_enable">גישה ליישומון צד שלישי</string>
-</resources>
+<string name="trisa_scale_not_paired">המשקל טרם עבר צימוד!
+\n
+\nיש להחזיק את הכפתור בתחתית המשקל כדי להפעיל אותו במצב צימוד ואז להתחבר מחדש כדי לקבל את הססמה של המכשיר.</string>
+    <string name="trisa_scale_pairing_succeeded">הצימוד הצליח!
+\n
+\nיש להתחבר מחדש כדי לקבל את נתוני המדידות.</string>
+
+    </resources>

android_app/app/src/main/res/values-nb/strings.xml

@@ -246,4 +246,11 @@
     <string name="permission_read_data_description">les openScale-data, inkludert brukerinfo, og alle lagrede målinger</string>
     <string name="permission_read_data_label">Les openScale-data</string>
 <string name="label_data_provider_enable">Tilgang for tredjepartsprogrammer</string>
-</resources>
+<string name="trisa_scale_not_paired">Denne vekten har ikke blitt parret.
+\n
+\nHold knappen på bunnen av vekten for å sette den i paringsmodus, koble deretter til den igjen for å hente enhetens passord.</string>
+    <string name="trisa_scale_pairing_succeeded">Paring utført.
+\n
+\nKoble til igjen for å hente målingsdata.</string>
+
+    </resources>