GPS Passive recording feature

.travis.yml

@@ -34,7 +34,7 @@ android:
     # tools required
     - tools
     # The BuildTools version used by your project
-    - build-tools-28.0.2
+    - build-tools-28.0.3
     # The SDK version used to compile your projects
     - android-27
     - android-22

SPECIFICATION.md

@@ -236,6 +236,58 @@ public void addWmtsLayer(WmtsCapabilities capabilities, String layerIdentifier)
 public void addWmtsLayer(WmtsCapabilities capabilities, String layerIdentifier, String styleIdentifier, String tileMatrixSetLinkIdentifier) throws Exception
 ```
 
+## 2. Using Tracking Service
+
+The Tracking Service is a foreground service providing Locations points regarding some options.
+The application needs to register the TrackingService listener to be able to receive notifications when :
+- First location as been received
+- A new location has been recorded
+- A location has been recorded close to the first location recorded
+
+### API available
+
+The `KujakuMapView` has public methods to control the TrackingService :
+
+* This method initialize the Tracking Service and need an instance of TrackingServiceListener and instance of TrackingServiceOptions
+```
+ void initTrackingService(@NonNull TrackingServiceListener trackingServiceListener, TrackingServiceUIConfiguration uiConfiguration, TrackingServiceOptions options);
+```
+
+* This method starts the Tracking Service and need the context and the class of the host activity
+```
+ void startTrackingService(@NonNull Context context, @NonNull Class<?> cls) throws TrackingServiceNotInitializedException;
+```
+
+* This method stops the Tracking Service et returns a collection of collected Locations
+```
+public List<Location> stopTrackingService(@NonNull Context context)
+```
+
+* This method can bind to an already running instance of the TrackingService
+```
+public boolean resumeTrackingService(Context context)
+```
+
+* This method allows the user to force take a location. The last received pending location is then recorded
+```
+public void trackingServiceTakeLocation()
+```
+
+* This method returns a collection of collected Locations 
+```
+public List<Location> getTrackingServiceRecordedLocations()
+```
+
+### TrackingService options
+
+The abstract class `TrackingServiceOptions` provides parameters to the TrackingService instance.
+2 classes extending the `TrackingServiceOptions` are available but you can create your own TrackingServiceOptions instance if needed.
+All parameters are explained in the `TrackingServiceOptions`class.
+
+### TrackingService UI configuration
+
+The abstract class `TrackingServiceUIConfiguration` provides ui configuration to the TrackingService instance.
+1 class extending the `TrackingServiceUIConfiguration` is available but you can create your own TrackingServiceUIConfiguration instance if needed.
 
 ## Offline Maps Downloader Service
 

build.gradle

@@ -1,5 +1,3 @@
-import groovy.transform.Field
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
@@ -37,7 +35,7 @@ task clean(type: Delete) {
 
 ext {
     supportVersion = '27.1.1'
-    buildToolsVersion = "28.0.2"
+    buildToolsVersion = "28.0.3"
     compileSdkVersion = 27
     volleyVersion = "1.1.0"
     targetSdkVersion = 27

gradle.properties

@@ -30,3 +30,5 @@ POM_SETTING_LICENCE_DIST=repo
 POM_SETTING_DEVELOPER_ID=opensrp
 POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev
 
+# android.debug.obsoleteApi=true
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 26 19:47:37 EAT 2018
+#Thu Feb 28 14:26:07 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

library/src/androidTest/java/io/ona/kujaku/views/KujakuMapViewTest.java

@@ -128,8 +128,8 @@ public void enableAddPointShouldHideMarkerLayoutWhenPassedFalse() throws NoSuchF
 
     @Test
     public void enableAddPointShouldEnableLocationUpdatesWhenGivenOnLocationChangedAndTrue() throws NoSuchFieldException, IllegalAccessException {
-        String isMapScrollingVariableName = "isMapScrolled";
-        insertValueInPrivateField(KujakuMapView.class, kujakuMapView, isMapScrollingVariableName, true);
+        String updateCameraUserLocationOnMap = "updateCameraUserLocationOnMap";
+        insertValueInPrivateField(KujakuMapView.class, kujakuMapView, updateCameraUserLocationOnMap, false);
 
         OnLocationChanged onLocationChanged = new OnLocationChanged() {
             @Override
@@ -139,7 +139,7 @@ public void onLocationChanged(Location location) {
         };
 
         kujakuMapView.enableAddPoint(true, onLocationChanged);
-        assertFalse((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, isMapScrollingVariableName));
+        assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateCameraUserLocationOnMap));
         assertEquals(onLocationChanged, getValueInPrivateField(KujakuMapView.class, kujakuMapView, "onLocationChangedListener"));
         assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, "updateUserLocationOnMap"));
     }
@@ -251,17 +251,20 @@ public void showCurrentLocationBtnShouldChangeVisibleWhenCalled() {
     @Test
     public void focusOnUserLocationShouldChangeTargetIconWhenCalled() throws NoSuchFieldException, IllegalAccessException {
         String updateUserLocationOnMap = "updateUserLocationOnMap";
+        String updateCameraUserLocationOnMap = "updateCameraUserLocationOnMap";
 
         kujakuMapView.focusOnUserLocation(true);
         assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateUserLocationOnMap));
+        assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateCameraUserLocationOnMap));
         ImageButton imageButton = kujakuMapView.findViewById(R.id.ib_mapview_focusOnMyLocationIcon);
 
         int drawableResId = (int) getValueInPrivateField(ImageView.class, imageButton, "mResource");
         assertEquals(R.drawable.ic_cross_hair_blue, drawableResId);
 
 
         kujakuMapView.focusOnUserLocation(false);
-        assertFalse((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateUserLocationOnMap));
+        assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateUserLocationOnMap));
+        assertFalse((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateCameraUserLocationOnMap));
 
         drawableResId = (int) getValueInPrivateField(ImageView.class, imageButton, "mResource");
         assertEquals(R.drawable.ic_cross_hair, drawableResId);
@@ -270,17 +273,20 @@ public void focusOnUserLocationShouldChangeTargetIconWhenCalled() throws NoSuchF
     @Test
     public void focusOnUserLocationWithRadiusShouldChangeTargetIconWhenCalled() throws NoSuchFieldException, IllegalAccessException {
         String updateUserLocationOnMap = "updateUserLocationOnMap";
+        String updateCameraUserLocationOnMap = "updateCameraUserLocationOnMap";
 
         kujakuMapView.focusOnUserLocation(true, 25f);
         assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateUserLocationOnMap));
+        assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateCameraUserLocationOnMap));
         ImageButton imageButton = kujakuMapView.findViewById(R.id.ib_mapview_focusOnMyLocationIcon);
 
         int drawableResId = (int) getValueInPrivateField(ImageView.class, imageButton, "mResource");
         assertEquals(R.drawable.ic_cross_hair_blue, drawableResId);
 
 
         kujakuMapView.focusOnUserLocation(false);
-        assertFalse((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateUserLocationOnMap));
+        assertTrue((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateUserLocationOnMap));
+        assertFalse((boolean) getValueInPrivateField(KujakuMapView.class, kujakuMapView, updateCameraUserLocationOnMap));
 
         drawableResId = (int) getValueInPrivateField(ImageView.class, imageButton, "mResource");
         assertEquals(R.drawable.ic_cross_hair, drawableResId);

library/src/main/AndroidManifest.xml

@@ -8,6 +8,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:allowBackup="true"
@@ -17,6 +19,9 @@
             android:name=".activities.MapActivity"
             android:exported="false" />
         <service android:name=".services.MapboxOfflineDownloaderService"/>
+        <service android:name=".services.TrackingService"
+            android:label="Tracking Service">
+        </service>
         <receiver android:name=".receivers.KujakuNetworkChangeReceiver">
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>

library/src/main/java/io/ona/kujaku/activities/MapActivity.java

@@ -44,7 +44,7 @@
 import io.ona.kujaku.adapters.InfoWindowObject;
 import io.ona.kujaku.adapters.holders.InfoWindowViewHolder;
 import io.ona.kujaku.domain.Point;
-import io.ona.kujaku.helpers.MapBoxStyleStorage;
+import io.ona.kujaku.helpers.storage.MapBoxStyleStorage;
 import io.ona.kujaku.sorting.Sorter;
 import io.ona.kujaku.utils.Constants;
 import io.ona.kujaku.utils.Permissions;
@@ -467,9 +467,9 @@ protected void onPause() {
     protected void onDestroy() {
         super.onDestroy();
 
-        if (currentStylePath != null && currentStylePath.startsWith("file://") && currentStylePath.contains(MapBoxStyleStorage.DIRECTORY)) {
+        if (currentStylePath != null && currentStylePath.startsWith("file://") && currentStylePath.contains(MapBoxStyleStorage.BASE_DIRECTORY)) {
             new MapBoxStyleStorage()
-                    .deleteFile(currentStylePath.replace("file://", ""), true);
+                    .deleteFile(currentStylePath.replace("file://", ""), true, false);
         }
 
         if (kujakuMapView != null) kujakuMapView.onDestroy();

library/src/main/java/io/ona/kujaku/exceptions/TrackingServiceNotInitializedException.java

@@ -0,0 +1,16 @@
+package io.ona.kujaku.exceptions;
+
+/**
+ * Created by Emmanuel Otin - [email protected] 12/04/19.
+ */
+public class TrackingServiceNotInitializedException extends Exception {
+
+    public TrackingServiceNotInitializedException() {
+        super("The TackingService has not been initialized");
+    }
+
+    public TrackingServiceNotInitializedException(String message) {
+        super(message);
+    }
+
+}