From e39474351d7dd18f0f16e3c1186b4fa231b6805c Mon Sep 17 00:00:00 2001 From: oliexdev Date: Sun, 17 Mar 2019 18:33:11 +0100 Subject: [PATCH] merged local branch into master branch --- .../com/health/openscale/core/OpenScale.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java index bbcb82a1..a8e842e5 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java @@ -523,6 +523,7 @@ public class OpenScale { public void clearScaleData(int userId) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); prefs.edit().putInt("uniqueNumber", 0x00).apply(); + syncClearMeasurements(); measurementDAO.deleteAll(userId); updateScaleData(); @@ -699,6 +700,13 @@ public class OpenScale { ContextCompat.startForegroundService(context, intent); } + private void syncClearMeasurements() { + Intent intent = new Intent(); + intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService")); + intent.putExtra("mode", "clear"); + ContextCompat.startForegroundService(context, intent); + } + public ScaleMeasurementDAO getScaleMeasurementDAO() { return measurementDAO; } @@ -706,4 +714,14 @@ public class OpenScale { public ScaleUserDAO getScaleUserDAO() { return userDAO; } + + private void runUiToastMsg(String text) { + Handler handler = new Handler(Looper.getMainLooper()); + handler.post(new Runnable() { + @Override + public void run() { + Toast.makeText(context, text, Toast.LENGTH_SHORT).show(); + } + }); + } }