mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-18 14:31:23 +02:00
Code Issues Releases Wiki Activity

updated sync methods to work with new openScale sync version 0.4

Browse Source
This commit is contained in:
oliexdev
2025-05-11 09:38:11 +02:00
parent 5742796444
commit 2245b105f0
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -344,7 +344,8 @@ public class OpenScale {
runUiToastMsg(infoText); runUiToastMsg(infoText);
} }
syncInsertMeasurement(scaleMeasurement); syncInsertMeasurement(scaleMeasurement, "com.health.openscale.sync");
syncInsertMeasurement(scaleMeasurement, "com.health.openscale.sync.oss");
alarmHandler.entryChanged(context, scaleMeasurement); alarmHandler.entryChanged(context, scaleMeasurement);
triggerWidgetUpdate(); triggerWidgetUpdate();
} else { } else {
@@ -415,13 +416,16 @@ public class OpenScale {
Timber.d("Update measurement: %s", scaleMeasurement); Timber.d("Update measurement: %s", scaleMeasurement);
measurementDAO.update(scaleMeasurement); measurementDAO.update(scaleMeasurement);
alarmHandler.entryChanged(context, scaleMeasurement); alarmHandler.entryChanged(context, scaleMeasurement);
syncUpdateMeasurement(scaleMeasurement); syncUpdateMeasurement(scaleMeasurement, "com.health.openscale.sync");
syncUpdateMeasurement(scaleMeasurement, "com.health.openscale.sync.oss");
triggerWidgetUpdate(); triggerWidgetUpdate();
} }
public void deleteScaleMeasurement(int id) { public void deleteScaleMeasurement(int id) {
syncDeleteMeasurement(measurementDAO.get(id).getDateTime()); syncDeleteMeasurement(measurementDAO.get(id).getDateTime(), "com.health.openscale.sync");
syncDeleteMeasurement(measurementDAO.get(id).getDateTime(), "com.health.openscale.sync.oss");
measurementDAO.delete(id); measurementDAO.delete(id);
} }
@@ -552,7 +556,9 @@ public class OpenScale {
public void clearScaleMeasurements(int userId) { public void clearScaleMeasurements(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(); syncClearMeasurements("com.health.openscale.sync");
syncClearMeasurements("com.health.openscale.sync.oss");
measurementDAO.deleteAll(userId); measurementDAO.deleteAll(userId);
} }
@@ -717,9 +723,9 @@ public class OpenScale {
}); });
} }
private void syncInsertMeasurement(ScaleMeasurement scaleMeasurement) { private void syncInsertMeasurement(ScaleMeasurement scaleMeasurement, String pkgName) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService")); intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
intent.putExtra("mode", "insert"); intent.putExtra("mode", "insert");
intent.putExtra("userId", scaleMeasurement.getUserId()); intent.putExtra("userId", scaleMeasurement.getUserId());
intent.putExtra("weight", scaleMeasurement.getWeight()); intent.putExtra("weight", scaleMeasurement.getWeight());
@@ -730,9 +736,9 @@ public class OpenScale {
ContextCompat.startForegroundService(context, intent); ContextCompat.startForegroundService(context, intent);
} }
private void syncUpdateMeasurement(ScaleMeasurement scaleMeasurement) { private void syncUpdateMeasurement(ScaleMeasurement scaleMeasurement, String pkgName) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService")); intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
intent.putExtra("mode", "update"); intent.putExtra("mode", "update");
intent.putExtra("userId", scaleMeasurement.getUserId()); intent.putExtra("userId", scaleMeasurement.getUserId());
intent.putExtra("weight", scaleMeasurement.getWeight()); intent.putExtra("weight", scaleMeasurement.getWeight());
@@ -743,17 +749,17 @@ public class OpenScale {
ContextCompat.startForegroundService(context, intent); ContextCompat.startForegroundService(context, intent);
} }
private void syncDeleteMeasurement(Date date) { private void syncDeleteMeasurement(Date date, String pkgName) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService")); intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
intent.putExtra("mode", "delete"); intent.putExtra("mode", "delete");
intent.putExtra("date", date.getTime()); intent.putExtra("date", date.getTime());
ContextCompat.startForegroundService(context, intent); ContextCompat.startForegroundService(context, intent);
} }
private void syncClearMeasurements() { private void syncClearMeasurements(String pkgName) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService")); intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
intent.putExtra("mode", "clear"); intent.putExtra("mode", "clear");
ContextCompat.startForegroundService(context, intent); ContextCompat.startForegroundService(context, intent);
} }

2
android_app/build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.4.2' classpath 'com.android.tools.build:gradle:8.9.1'
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.4" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.4"
} }
} }

2
android_app/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip