mirror of
https://github.com/oliexdev/openScale.git
synced 2025-08-09 10:16:44 +02:00
merged local branch into master branch
This commit is contained in:
@@ -523,6 +523,7 @@ public class OpenScale {
|
|||||||
public void clearScaleData(int userId) {
|
public void clearScaleData(int userId) {
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||||
prefs.edit().putInt("uniqueNumber", 0x00).apply();
|
prefs.edit().putInt("uniqueNumber", 0x00).apply();
|
||||||
|
syncClearMeasurements();
|
||||||
measurementDAO.deleteAll(userId);
|
measurementDAO.deleteAll(userId);
|
||||||
|
|
||||||
updateScaleData();
|
updateScaleData();
|
||||||
@@ -699,6 +700,13 @@ public class OpenScale {
|
|||||||
ContextCompat.startForegroundService(context, intent);
|
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() {
|
public ScaleMeasurementDAO getScaleMeasurementDAO() {
|
||||||
return measurementDAO;
|
return measurementDAO;
|
||||||
}
|
}
|
||||||
@@ -706,4 +714,14 @@ public class OpenScale {
|
|||||||
public ScaleUserDAO getScaleUserDAO() {
|
public ScaleUserDAO getScaleUserDAO() {
|
||||||
return userDAO;
|
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();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user