Merge pull request #47 from spark/token_release

Session token release
particle-iot · Jul 15, 2017 · b3deed3 · b3deed3
2 parents 72a3bde + 48b89ca
commit b3deed3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+0.4.6
+=====
+* Adding refresh and inject session token methods.
+
+
 0.4.5
 =====
 * Exposing iccid and data usage for electron.

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'

diff --git a/cloudsdk/build.gradle b/cloudsdk/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'me.tatarka.retrolambda'
 
 // This is the library version used when deploying the artifact
-version = '0.4.5'
+version = '0.4.6'
 
 ext {
     bintrayRepo = 'android'
@@ -36,7 +36,7 @@ ext {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    buildToolsVersion '25.0.3'
 
     dexOptions {
         javaMaxHeapSize "2g"

diff --git a/cloudsdk/src/main/java/io/particle/android/sdk/cloud/ParticleDevice.java b/cloudsdk/src/main/java/io/particle/android/sdk/cloud/ParticleDevice.java
@@ -253,9 +253,9 @@ public Date getLastHeard() {
 
     @WorkerThread
     public float getCurrentDataUsage() throws ParticleCloudException {
-        Response response = mainApi.getCurrentDataUsage(deviceState.lastIccid);
         float maxUsage = 0;
         try {
+            Response response = mainApi.getCurrentDataUsage(deviceState.lastIccid);
             JSONObject result = new JSONObject(new String(((TypedByteArray) response.getBody()).getBytes()));
             JSONArray usages = result.getJSONArray("usage_by_day");
 
@@ -268,7 +268,7 @@ public float getCurrentDataUsage() throws ParticleCloudException {
                     }
                 }
             }
-        } catch (JSONException e) {
+        } catch (JSONException | RetrofitError e) {
             throw new ParticleCloudException(e);
         }
         return maxUsage;

diff --git a/example_app/build.gradle b/example_app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         applicationId "io.particle.cloudsdk.example_app"
@@ -41,9 +41,14 @@ dependencies {
     // UNCOMMENT THE FOLLOWING TO USE A PUBLISHED VERSION OF THE SDK:
     //    compile 'io.particle:cloudsdk:0.3.3'
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-fragment:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.4.0'
+    compile 'com.android.support:support-fragment:25.4.0'
 
     retrolambdaConfig 'net.orfjackal.retrolambda:retrolambda:2.3.0'
 }
 
+    repositories {
+        maven {
+            url 'https://maven.google.com'
+        }
+    }