Merge pull request #166 from senseobservationsystems/release/v3.4.3

Release/v3.4.3

Author: RonaldOlsthoorn

.gitignore

@@ -25,3 +25,8 @@ local.properties
 # ignore changes to the AppInfoVersion
 sense-android-library/src/nl/sense_os/service/phonestate/AppInfoVersion.java
 docs
+.DS_Store
+sense-android-library/.DS_Store
+sense-android-library/src/.DS_Store
+sense-android-library/src/nl/.DS_Store
+sense-android-library/src/nl/sense_os/.DS_Store

sense-android-library/AndroidManifest.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="nl.sense_os.service"
-    android:versionName="3.4.2">
+    android:versionName="3.4.3">
     <!-- <uses-sdk -->
-    <uses-sdk android:minSdkVersion="7"/>
+    <uses-sdk android:minSdkVersion="7" tools:overrideLibrary="com.google.android.gms"/>
+ 
 </manifest>

sense-android-library/build.gradle

@@ -3,35 +3,38 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5+'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
-apply plugin: 'android-library'
-
+apply plugin: 'com.android.library'
+ 
 repositories {
-    mavenCentral()
+    jcenter()
 }
-
+ 
 dependencies {
-    compile 'com.android.support:support-v4:13.0.0'
-    compile files('libs/gcm.jar', 'libs/cordova-3.6.4.jar')
+    compile 'com.android.support:support-v4:19.+'
+    compile 'com.android.support:appcompat-v7:19.+'
+    compile 'com.google.android.gms:play-services:6.1.71'
+    compile files('libs/gcm.jar', 'libs/cordova-3.6.4.jar', 'libs/sqlcipher.jar')
 }
-
+ 
 android {
-    compileSdkVersion 17
-    buildToolsVersion "17.0.0"
-
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+ 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             resources.srcDirs = ['src']
             aidl.srcDirs = ['src']
             renderscript.srcDirs = ['src']
+            jniLibs.srcDirs = ['libs']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
-
+ 
         instrumentTest.setRoot('tests')
     }
-}
+}

sense-android-library/documentation/manifest.md

@@ -1,5 +1,5 @@
 # AndroidManifest {#androidmanifest}
-The Android manifest defines the permissions, services and intent handlers used by the Sense Android library. 
+The Android manifest defines the permissions, services and intent handlers used by the Sense Android library. An example manifest file can be found in the sense-android-demo: https://github.com/senseobservationsystems/sense-android-library/blob/master/samples/sense-android-demo/AndroidManifest.xml
 
 # Permissions {#permissions}
 The Sense Android library defines a lot of permissions because the library should be capable of accessing many different resources for  the wide variety of sensor output streams. It is not recommended to leave any of these permission out of your application's manifest, but if you want to do so then please make sure that all the required sensors produce valid output.  

sense-android-library/src/nl/sense_os/platform/SensePlatform.java

@@ -462,6 +462,42 @@ public JSONArray getLocalData(String sensorName, int limit) throws IllegalStateE
         return result;
     }
 
+    /**
+     * Retrieve a number of values of a sensor from the local storage.
+     * 
+     * @param sensorName
+     *            The name of the sensor to get data from
+     * @param onlyFromDevice
+     *            Whether or not to only look through sensors that are part of this device. Searches
+     *            all sensors, including those of this device, if set to NO
+     * @param startDate 
+     *            The epoch start date in milliseconds of the period to get the sensor data from
+     * @param endDate 
+     *            The epoch end date in milliseconds of the period to get the sensor data from
+     * @param limit
+     *            Maximum amount of data points.
+     * @return JSONArray of data points
+     * @throws IllegalStateException
+     *             If the Sense service is not bound yet
+     * @throws JSONException
+     *             If the response from CommonSense could not be parsed
+     */
+    public JSONArray getLocalData(String sensorName, int limit, boolean onlyFromDevice, long startDate, long endDate) throws IllegalStateException,
+            JSONException {
+        checkSenseService();
+
+        JSONArray result = new JSONArray();
+
+        // select remote path in local storage
+        String localStorage = mContext.getString(R.string.local_storage_authority);
+        Uri uri = Uri.parse("content://" + localStorage + DataPoint.CONTENT_URI_PATH);
+
+        // get the data
+        result = getValues(sensorName, onlyFromDevice, limit, uri, startDate, endDate);
+
+        return result;
+    }
+
     /**
      * Retrieve a number of values of a sensor from the local storage.
      * 

sense-android-library/src/nl/sense_os/service/location/FusedLocationSensor.java

@@ -59,6 +59,15 @@ public class FusedLocationSensor extends BaseSensor implements PeriodicPollingSe
     private TraveledDistanceEstimator distanceEstimator;
     private PeriodicPollAlarmReceiver pollAlarmReceiver;
 
+    private static final long BALANCED_FASTEST_INTERVAL_MILISECONDS = 1*60*1000;
+    private static final long BALANCED_INTERVAL_MILISECONDS         = 5*60*1000;
+
+    private static final long HIGH_ACCURACY_FASTEST_INTERVAL_MILISECONDS = 1*1000;
+    private static final long HIGH_ACCURACY_INTERVAL_MILISECONDS         = 5*1000;
+
+
+
+
     /**
      * Constructor.
      * 
@@ -132,10 +141,16 @@ protected LocationRequest createLocationRequest() {
         String priority = mainPrefs.getString(SensePrefs.Main.Location.FUSED_PROVIDER_PRIORITY, SensePrefs.Main.Location.FusedProviderPriority.BALANCED);
         if(priority.equals(SensePrefs.Main.Location.FusedProviderPriority.LOW_POWER))
             locationRequest.setPriority(LocationRequest.PRIORITY_LOW_POWER);
-        else if(priority.equals(SensePrefs.Main.Location.FusedProviderPriority.ACCURATE))
+        else if(priority.equals(SensePrefs.Main.Location.FusedProviderPriority.ACCURATE)){
             locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-        else
+            locationRequest.setFastestInterval(HIGH_ACCURACY_FASTEST_INTERVAL_MILISECONDS);
+            locationRequest.setInterval(HIGH_ACCURACY_INTERVAL_MILISECONDS);
+        }
+        else{
             locationRequest.setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
+            locationRequest.setFastestInterval(BALANCED_FASTEST_INTERVAL_MILISECONDS);
+            locationRequest.setInterval(BALANCED_INTERVAL_MILISECONDS);
+        }
         return locationRequest;
     }
 
@@ -280,9 +295,10 @@ private void stopPolling() {
 
     @Override
     public void stopSensing() {
-        LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, this);
-        if(googleApiClient.isConnected())
+        if(googleApiClient.isConnected()) {
+            LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, this);
             googleApiClient.disconnect();
+        }
 
         active = false;
         stopAlarms();