Merge pull request #151 from senseobservationsystems/release/v3.4

Release/v3.4

Author: Ted Schmidt

.gitignore

@@ -20,4 +20,6 @@ gen/
 
 # Local configuration file (sdk path, etc)
 local.properties
-
+# ignore changes to the AppInfoVersion
+sense-android-library/src/nl/sense_os/service/phonestate/AppInfoVersion.java
+docs

CHANGELOG.md

@@ -1,3 +1,21 @@
+
+## v3.4-rc2 (2015-03-10)
+
+### Fixed
+* Changed the implicit intents for starting services to explicit with the package as scope
+
+## v3.4-rc1 (2015-03-02)
+
+### Added
+* Added a new implementation for the position sensor which uses the FusedLocationProvider of Google Play Services via SensePrefs.Location.FUSED_PROVIDER. The goal accuracy/battery consumption can be set via SensePrefs.Location.FUSED_PROVIDER_PRIORITY.
+
+### Deprecated
+* The position sensor using the Android framework location API's via SensePrefs.Location.GPS|WIFI|AUTO_GPS
+
+### Dependency
+* Google Play services client library 
+
+
 ## v3.3.5 (2015-03-30)
 
 ### Fixed
@@ -15,7 +33,6 @@
 ### Fixed
 * Fix setPrefInt in SenseServiceStub to use putInt instead of putFloat
 
-
 ## v3.3.2 (2015-03-02)
 
 ### Changed

README.md

@@ -19,23 +19,23 @@ into your local Maven repository as follows.
 First add some dependencies to your local Maven repository that are not available 
 in Maven central:
 
-#### Dependency 1: compatibility-v4 library (rev 12)
+#### Dependency 1: compatibility-v4 library (rev  21.0.3)
 
-Note that you need the compatibility-v4 library, revision 12. Google didn't put that 
-into Maven central (yet). If your local Maven repository does not contain it, install 
+Note that you need the compatibility-v4 library, revision  21.0.3. Google didn't put that 
+into Maven central. If your local Maven repository does not contain it, install 
 it locally by using the 
 [maven-android-sdk-deployer](https://github.com/mosabua/maven-android-sdk-deployer).
 
-#### Dependency 2: cordova 2.7.0
+#### Dependency 2: cordova 3.6.4
 
 Navigate to the Library's `libs/` folder and execute the following command:
 
 ```bash
 mvn install:install-file \
-  -Dfile=cordova-2.7.0.jar \
+  -Dfile=cordova-3.6.4.jar \
   -DgroupId=org.apache.cordova \
   -DartifactId=cordova \
-  -Dversion=2.7.0 \
+  -Dversion=3.6.4 \
   -Dpackaging=jar \
   -DgeneratePom=true
 ```
@@ -60,6 +60,9 @@ by adding the following dependency to your POM:
 </dependency>
 ```
 
+#### Dependency 3: Google Play services client library
+Starting from version 3.4 the Google Play services client library is a requirement because there is a new implementation of the position sensor which uses the Fused Location Provider. To setup Google Play services follow these instructions: https://developer.android.com/google/play-services/setup.html
+
 ## Pre-build commands
 
 The `build/` folder contains scripts that need to be executed right before every build.

samples/sense-android-demo/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
 
     <!-- REQUEST ACCESS TO LOCATION SENSORS -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -227,6 +228,9 @@
             android:name="nl.sense_os.service.provider.SensorDataProvider"
             android:authorities="nl.sense_os.demo.LocalStorage"
             android:exported="true" />
+        <!-- GOOGLE PLAY SERVICES USED FOR THE FUSED LOCATION PROVIDER -->
+        <meta-data android:name="com.google.android.gms.version"
+           android:value="@integer/google_play_services_version" />
     </application>
 
 </manifest>

samples/sense-android-demo/project.properties

@@ -13,3 +13,4 @@
 # Project target.
 target=android-16
 android.library.reference.1=../../sense-android-library
+android.library.reference.2=../../../google-play-services_lib_brightr

samples/sense-android-demo/src/nl/sense/demo/MainActivity.java

@@ -6,6 +6,7 @@
 import nl.sense_os.service.constants.SenseDataTypes;
 import nl.sense_os.service.constants.SensePrefs;
 import nl.sense_os.service.constants.SensePrefs.Main.Ambience;
+import nl.sense_os.service.constants.SensePrefs.Main.Location;
 import nl.sense_os.service.constants.SensePrefs.Main.Advanced;
 
 import org.json.JSONArray;
@@ -205,19 +206,23 @@ private void setPreferences() {
         // NOTE: spectrum might be too heavy for the phone or consume too much energy
         senseService.setPrefBool(Ambience.AUDIO_SPECTRUM, true);
 
+        // use the location sensor with the Google Play Service FusedLocationProvider
+        senseService.setPrefBool(Location.FUSED_PROVIDER, true);
+        senseService.setPrefString(Location.FUSED_PROVIDER_PRIORITY, Location.FusedProviderPriority.BALANCED);
+
         // set how often to sample
         // 1 := rarely (~every 15 min)
-        // 0 := normal (~every 5 min)
+        // 0 := normal (~every 1 min)
         // -1 := often (~every 10 sec)
-        // -2 := real time (this setting affects power consumption considerably!)
-        senseService.setPrefString(SensePrefs.Main.SAMPLE_RATE, "-1");
+        // -2 := real time (~every sec, this setting affects power consumption considerably!)
+        senseService.setPrefString(SensePrefs.Main.SAMPLE_RATE, SensePrefs.Main.SampleRate.BALANCED);
 
         // set how often to upload
         // 1 := eco mode (buffer data for 30 minutes before bulk uploading)
         // 0 := normal (buffer 5 min)
         // -1 := often (buffer 1 min)
         // -2 := real time (every new data point is uploaded immediately)
-        senseService.setPrefString(SensePrefs.Main.SYNC_RATE, "-2");
+        senseService.setPrefString(SensePrefs.Main.SYNC_RATE, SensePrefs.Main.SyncRate.REAL_TIME);
 
         // show message
         showToast(R.string.msg_prefs_set);

sense-android-library/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="nl.sense_os.service"
-    android:versionName="3.3.5">
+    android:versionName="3.4">
     <!-- <uses-sdk -->
     <uses-sdk android:minSdkVersion="7"/>
 </manifest>

sense-android-library/libs/android-support-v4.jar

@@ -439,8 +439,8 @@ private void onLoginSuccess() {
         if (packageName.equals("nl.sense_os.ivitality")) {
             Log.w(TAG, "Set special iVitality sensor settings");
             SenseServiceStub service = sensePlatform.getService();
-            service.setPrefString(SensePrefs.Main.SAMPLE_RATE, "0");
-            service.setPrefString(SensePrefs.Main.SYNC_RATE, "1");
+            service.setPrefString(SensePrefs.Main.SAMPLE_RATE, SensePrefs.Main.SampleRate.NORMAL);
+            service.setPrefString(SensePrefs.Main.SYNC_RATE, SensePrefs.Main.SyncRate.ECO_MODE);
 
             service.setPrefBool(SensePrefs.Main.Ambience.MIC, true);
             service.setPrefBool(SensePrefs.Main.Ambience.LIGHT, true);

sense-android-library/src/com/phonegap/plugins/sense/SensePlugin.java

@@ -30,6 +30,7 @@
 import nl.sense_os.service.external_sensors.NewOBD2DeviceConnector;
 import nl.sense_os.service.external_sensors.ZephyrBioHarness;
 import nl.sense_os.service.external_sensors.ZephyrHxM;
+import nl.sense_os.service.location.FusedLocationSensor;
 import nl.sense_os.service.location.LocationSensor;
 import nl.sense_os.service.location.TimeZoneSensor;
 import nl.sense_os.service.motion.MotionSensor;
@@ -132,6 +133,7 @@ public SenseServiceStub getService() {
     private AppsSensor appsSensor;
     private TimeZoneSensor timeZoneSensor;
     private AppInfoSensor appInfoSensor;
+    private FusedLocationSensor fusedLocationListener;
 
     /**
      * Handler on main application thread to display toasts to the user.
@@ -724,6 +726,9 @@ synchronized void toggleAmbience(boolean active) {
                 case 1: // rarely (15 minutes)
                     interval = 15 * 60 * 1000;
                     break;
+                case 2: // balanced (3 minutes)
+                    interval = 3 * 60 * 1000;
+                    break;
                 default:
                     Log.e(TAG, "Unexpected sample rate preference.");
                 }
@@ -883,19 +888,22 @@ synchronized void toggleDeviceProx(boolean active) {
                 int interval = 1;
                 switch (rate) {
                 case -2:
-                    interval = 60 * 1000;
+                    interval = 1000;
                     break;
                 case -1:
                     // often
-                    interval = 5 * 60 * 1000;
+                    interval = 10 * 1000;
                     break;
                 case 0:
                     // normal
-                    interval = 20 * 60 * 1000;
+                    interval = 60 * 1000;
                     break;
                 case 1:
                     // rarely (15 mins)
-                    interval = 60 * 60 * 1000;
+                    interval = 15 * 60 * 1000;
+                    break;
+                case 2: // balanced (3 minutes)
+                    interval = 3 * 60 * 1000;
                     break;
                 default:
                     Log.e(TAG, "Unexpected device proximity rate preference.");
@@ -997,6 +1005,9 @@ synchronized void toggleExternalSensors(boolean active) {
                     // rarely (15 minutes)
                     interval = 15 * 60 * 1000;
                     break;
+                case 2: // balanced (3 minutes)
+                    interval = 3 * 60 * 1000;
+                    break;
                 default:
                     Log.e(TAG, "Unexpected external sensor rate preference.");
                     return;
@@ -1105,6 +1116,12 @@ synchronized void toggleLocation(boolean active) {
                     timeZoneSensor = null;
                 }
 
+                if(fusedLocationListener != null)
+                {
+                    fusedLocationListener.stopSensing();
+                    fusedLocationListener = null;
+                }
+
                 // get sample rate
                 final SharedPreferences mainPrefs = getSharedPreferences(SensePrefs.MAIN_PREFS,
                         MODE_PRIVATE);
@@ -1124,6 +1141,9 @@ synchronized void toggleLocation(boolean active) {
                 case 1: // rarely
                     minTime = 15 * 60 * 1000;
                     break;
+                case 2: // balanced (same as normal)
+                    minTime = 5 * 60 * 1000;
+                    break;
                 default:
                     Log.e(TAG, "Unexpected commonsense rate: " + rate);
                     break;
@@ -1161,6 +1181,15 @@ public void run() {
                             mSubscrMgr.registerProducer(SensorNames.TIME_ZONE, timeZoneSensor);
                             timeZoneSensor.startSensing();
                         }
+
+                        if (mainPrefs.getBoolean(Location.FUSED_PROVIDER, false))
+                        {
+                            fusedLocationListener = FusedLocationSensor.getInstance(SenseService.this);
+                            mSubscrMgr.registerProducer(SensorNames.LOCATION, fusedLocationListener);
+                            mSubscrMgr.registerProducer(SensorNames.TRAVELED_DISTANCE_1H, fusedLocationListener);
+                            mSubscrMgr.registerProducer(SensorNames.TRAVELED_DISTANCE_24H, fusedLocationListener);
+                            fusedLocationListener.startSensing(time);
+                        }
                     }
                 });
 
@@ -1177,6 +1206,17 @@ public void run() {
                     locListener = null;
                 }
 
+                // stop fused location listener
+                if (null != fusedLocationListener)
+                {
+                    fusedLocationListener.stopSensing();
+                    // unregister is not needed for Singleton Sensors
+                    mSubscrMgr.unregisterProducer(SensorNames.LOCATION, fusedLocationListener);
+                    mSubscrMgr.unregisterProducer(SensorNames.TRAVELED_DISTANCE_1H, fusedLocationListener);
+                    mSubscrMgr.unregisterProducer(SensorNames.TRAVELED_DISTANCE_24H, fusedLocationListener);
+                    fusedLocationListener = null;
+                }
+
                 if(timeZoneSensor != null)
                 {
                     mSubscrMgr.unregisterProducer(SensorNames.TIME_ZONE, timeZoneSensor);
@@ -1246,6 +1286,9 @@ synchronized void toggleMotion(boolean active) {
                 case 1: // rarely (15 minutes)
                     interval = 15 * 60 * 1000;
                     break;
+                case 2: // balanced (3 minutes)
+                    interval = 3 * 60 * 1000;
+                    break;
                 default:
                     Log.e(TAG, "Unexpected commonsense rate: " + rate);
                     break;
@@ -1320,7 +1363,7 @@ synchronized void togglePhoneState(boolean active) {
                     batterySensor.stopBatterySensing();
                     batterySensor = null;
                 }
-                
+
                 // check app info sensor presence
                 if (appInfoSensor != null) {
                 	Log.w(TAG, "app info sensor is already present!");
@@ -1334,7 +1377,7 @@ synchronized void togglePhoneState(boolean active) {
                     phoneActivitySensor.stopPhoneActivitySensing();
                     phoneActivitySensor = null;
                 }
-                
+
                 // check apps sensor presence
                 if (appsSensor != null) {
                 	Log.w(TAG, "apps sensor is already present!");
@@ -1362,6 +1405,9 @@ synchronized void togglePhoneState(boolean active) {
                 case 1: // rarely (15 minutes)
                     interval = 15 * 60 * 1000;
                     break;
+                case 2: // balanced (3 minutes)
+                    interval = 3 * 60 * 1000;
+                    break;
                 default:
                     Log.e(TAG, "Unexpected commonsense rate: " + rate);
                     break;