4.0.0-alpha1 - compatible with WayToday Android 4.1

README.md

@@ -10,5 +10,11 @@ Add the library to the list of dependencies
 [![Release](https://jitpack.io/v/s4ysolutions/WayTodaySDK-Android.svg)](https://jitpack.io/#s4ysolutions/WayTodaySDK-Android)
 
 `AndroidWayTodayClient` wraps the  WayTodayClient from [WayTodaySDK-Java](https://github.com/s4ysolutions/WayTodaySDK-Java) and provides
-2 methods to create Workers to request tracker ID and to send location updates.
+ methods to create and enqueue Workers to request tracker ID and to send location updates.
 
+ Create a new instance of `AndroidWayTodayClient`
+```jave
+       AndroidWayTodayClient androidWayToday = new AndroidWayTodayClient(context, "app id", "app secret", "User visible app id");
+       androidWayToday.wtClient.addErrorsListener(wayTodayError -> {});
+       androidWayToday.enqueueTrackIdWorkRequest(context)
+```

waytoday-sdk/build.gradle

@@ -28,10 +28,10 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     api "androidx.work:work-runtime:2.9.0"
-    // api "solutions.s4y.gps:gps-sdk-android:1.0.0-dev.7"
-    api 'com.github.s4ysolutions:GPSAndroidSDK:2.0.0-alpha1'
-    // api "solutions.s4y.waytoday:waytoday-sdk-java:1.0.0-dev.4"
-    api 'com.github.s4ysolutions:WayTodaySDK-Java:2.0.0-alpha1'
+    api 'com.github.s4ysolutions:GPSAndroidSDK:3.0.0-alpha1'
+    //api "solutions.s4y.gps:gps-sdk-android:3.0.0-alpha1"
+    api 'com.github.s4ysolutions:WayTodaySDK-Java:3.0.0-alpha1'
+    //api "solutions.s4y.waytoday:waytoday-sdk-java:3.0.0-alpha1"
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'androidx.preference:preference:1.2.1'
 }
@@ -49,7 +49,7 @@ publishing {
         Release(MavenPublication) {
             groupId = 'solutions.s4y.waytoday'
             artifactId = 'waytoday-sdk-android'
-            version = '3.0.0-alpha1'
+            version = '4.0.0-alpha1'
 
             pom {
                 packaging 'aar'

waytoday-sdk/src/main/java/solutions/s4y/waytoday/sdk/AndroidWayTodayClient.java

@@ -20,6 +20,7 @@
 import s4y.gps.sdk.GPSUpdate;
 import s4y.gps.sdk.GPSUpdatesManager;
 import s4y.gps.sdk.android.GPSPowerManager;
+import s4y.gps.sdk.android.GPSPreferences;
 import s4y.gps.sdk.android.implementation.FusedGPSUpdatesProvider;
 import s4y.gps.sdk.dependencies.IGPSUpdatesProvider;
 
@@ -35,7 +36,7 @@ public class AndroidWayTodayClient implements Closeable {
 
     private final String provider;
     private final Context context;
-    private final PreferenceOn trackingOn;
+    private final GPSPreferences gpsPreferences;
 
     private static final HashMap<String, WayTodayClient> clients = new HashMap<>();
 
@@ -46,7 +47,7 @@ public class AndroidWayTodayClient implements Closeable {
     public AndroidWayTodayClient(Context context, String principal, String secret, boolean tls, String host, int port, String provider, Looper looper) {
         this.context = context;
         this.provider = provider;
-        trackingOn = new PreferenceOn(context);
+        gpsPreferences = new GPSPreferences(context);
 
         powerManager = new GPSPowerManager(context);
 
@@ -58,7 +59,7 @@ public AndroidWayTodayClient(Context context, String principal, String secret, b
         IGPSUpdatesProvider gpsUpdatesProvider = new FusedGPSUpdatesProvider(context, looper);
         gpsUpdatesManager = new GPSUpdatesManager(gpsUpdatesProvider, 500);
         gpsUpdatesManager.getLast().addListener(this::gpsUpdatesListener);
-        if (trackingOn.get()) {
+        if (gpsPreferences.getKeepAlive()) {
             gpsUpdatesManager.start();
         }
     }
@@ -177,12 +178,8 @@ private Unit gpsUpdatesListener(GPSUpdate gpsUpdate) {
         return Unit.INSTANCE;
     }
 
-    public boolean isTrackingOn() {
-        return trackingOn.get();
-    }
-
     public void enableTrackingOn() {
-        trackingOn.set(true);
+        gpsPreferences.setKeepAlive(true);
     }
 
     public void turnTrackingOn() {
@@ -191,11 +188,15 @@ public void turnTrackingOn() {
     }
 
     public void turnTrackingOff() {
-        this.trackingOn.set(false);
+        gpsPreferences.setKeepAlive(false);
         gpsUpdatesManager.stop();
     }
 
+    public boolean isTrackingOn() {
+        return gpsPreferences.getKeepAlive();
+    }
+
     static public boolean isTrackingOn(Context context) {
-        return new PreferenceOn(context).get();
+        return GPSPreferences.keepAlive(context);
     }
 }