Merge pull request #46 from spark/electron_info

exposing iccid and data usage for electron

Author: CityVibes

CHANGELOG

@@ -1,3 +1,8 @@
+0.4.5
+=====
+* Exposing iccid and data usage for electron.
+
+
 0.4.4
 =====
 * Adding back organization endpoints as deprecated.

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.4'
+version = '0.4.5'
 
 ext {
     bintrayRepo = 'android'

cloudsdk/src/main/java/io/particle/android/sdk/cloud/ApiDefs.java

@@ -37,6 +37,9 @@ public class ApiDefs {
      */
     public interface CloudApi {
 
+        @GET("/v1/sims/{lastIccid}/data_usage")
+        Response getCurrentDataUsage(@Path("lastIccid") String lastIccid);
+
         @GET("/v1/devices")
         List<Models.SimpleDevice> getDevices();
 
@@ -132,7 +135,7 @@ public interface IdentityApi {
         // a little odd, but that's how this endpoint works.
         @POST("/v1/products/{productId}/customers")
         Responses.LogInResponse signUpAndLogInWithCustomer(@Body SignUpInfo signUpInfo,
-                                                               @Path("productId") Integer productId);
+                                                           @Path("productId") Integer productId);
 
         // NOTE: the `LogInResponse` used here as a return type is intentional.  It looks
         // a little odd, but that's how this endpoint works.
@@ -154,7 +157,7 @@ Responses.LogInResponse logIn(@Field("grant_type") String grantType,
         @FormUrlEncoded
         @POST("/v1/products/{productId}/customers/reset_password")
         Response requestPasswordResetForCustomer(@Field("email") String email,
-                                                     @Path("productId") Integer productId);
+                                                 @Path("productId") Integer productId);
 
         @FormUrlEncoded
         @POST("/v1/orgs/{orgName}/customers/reset_password")

cloudsdk/src/main/java/io/particle/android/sdk/cloud/DeviceState.java

@@ -35,6 +35,7 @@ class DeviceState implements Parcelable {
     @Nullable final Boolean isConnected;
     @Nullable final Boolean cellular;
     @Nullable final String imei;
+    @Nullable final String lastIccid;
     @Nullable final String currentBuild;
     @Nullable final String defaultBuild;
     final Set<String> functions;
@@ -50,6 +51,7 @@ class DeviceState implements Parcelable {
         this.isConnected = deviceStateBuilder.isConnected;
         this.cellular = deviceStateBuilder.cellular;
         this.imei = deviceStateBuilder.imei;
+        this.lastIccid = deviceStateBuilder.lastIccid;
         this.currentBuild = deviceStateBuilder.currentBuild;
         this.defaultBuild = deviceStateBuilder.defaultBuild;
         this.functions = deviceStateBuilder.functions;
@@ -79,6 +81,7 @@ static DeviceState withNewName(DeviceState other, String newName) {
                 .platformId(other.platformId)
                 .productId(other.productId)
                 .imei(other.imei)
+                .iccid(other.lastIccid)
                 .currentBuild(other.currentBuild)
                 .defaultBuild(other.defaultBuild)
                 .ipAddress(other.ipAddress)
@@ -100,6 +103,7 @@ static DeviceState withNewConnectedState(DeviceState other, boolean newConnected
                 .platformId(other.platformId)
                 .productId(other.productId)
                 .imei(other.imei)
+                .iccid(other.lastIccid)
                 .currentBuild(other.currentBuild)
                 .defaultBuild(other.defaultBuild)
                 .ipAddress(other.ipAddress)
@@ -124,6 +128,7 @@ private DeviceState(Parcel in) {
         productId = (Integer) in.readValue(Integer.class.getClassLoader());
         cellular = (Boolean) in.readValue(Boolean.class.getClassLoader());
         imei = (String) in.readValue(String.class.getClassLoader());
+        lastIccid = (String) in.readValue(String.class.getClassLoader());
         currentBuild = (String) in.readValue(String.class.getClassLoader());
         defaultBuild = (String) in.readValue(String.class.getClassLoader());
         ipAddress = (String) in.readValue(String.class.getClassLoader());
@@ -146,6 +151,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeValue(productId);
         dest.writeValue(cellular);
         dest.writeValue(imei);
+        dest.writeValue(lastIccid);
         dest.writeValue(currentBuild);
         dest.writeValue(defaultBuild);
         dest.writeValue(ipAddress);
@@ -184,6 +190,7 @@ public static class DeviceStateBuilder {
         @Nullable private Boolean isConnected;
         @Nullable private Boolean cellular;
         @Nullable private String imei;
+        @Nullable private String lastIccid;
         @Nullable private String currentBuild;
         @Nullable private String defaultBuild;
         private final Set<String> functions;
@@ -246,6 +253,11 @@ public DeviceStateBuilder imei(@Nullable String imei) {
             return this;
         }
 
+        public DeviceStateBuilder iccid(@Nullable String iccid) {
+            this.lastIccid = iccid;
+            return this;
+        }
+
         public DeviceStateBuilder currentBuild(@Nullable String currentBuild) {
             this.currentBuild = currentBuild;
             return this;

cloudsdk/src/main/java/io/particle/android/sdk/cloud/ParticleCloud.java

@@ -7,7 +7,6 @@
 import android.support.annotation.WorkerThread;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.util.ArrayMap;
-import android.util.Log;
 
 import com.google.gson.Gson;
 
@@ -732,6 +731,7 @@ private DeviceState fromCompleteDevice(CompleteDevice completeDevice) {
                 .platformId(completeDevice.platformId)
                 .productId(completeDevice.productId)
                 .imei(completeDevice.imei)
+                .iccid(completeDevice.lastIccid)
                 .currentBuild(completeDevice.currentBuild)
                 .defaultBuild(completeDevice.defaultBuild)
                 .ipAddress(completeDevice.ipAddress)
@@ -756,6 +756,7 @@ private DeviceState fromSimpleDeviceModel(Models.SimpleDevice offlineDevice) {
                 .platformId(offlineDevice.platformId)
                 .productId(offlineDevice.productId)
                 .imei(offlineDevice.imei)
+                .iccid(offlineDevice.lastIccid)
                 .currentBuild(offlineDevice.currentBuild)
                 .defaultBuild(offlineDevice.defaultBuild)
                 .ipAddress(offlineDevice.ipAddress)

cloudsdk/src/main/java/io/particle/android/sdk/cloud/ParticleDevice.java

@@ -8,6 +8,9 @@
 import android.support.annotation.WorkerThread;
 
 import org.greenrobot.eventbus.EventBus;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,6 +34,7 @@
 import io.particle.android.sdk.utils.TLog;
 import okio.Okio;
 import retrofit.RetrofitError;
+import retrofit.client.Response;
 import retrofit.mime.TypedByteArray;
 import retrofit.mime.TypedFile;
 
@@ -88,7 +92,7 @@ public enum ParticleDeviceState {
         WENT_OFFLINE,
         UNKNOWN
     }
-  
+
     public enum VariableType {
         INT,
         DOUBLE,
@@ -219,6 +223,10 @@ public String getImei() {
         return deviceState.imei;
     }
 
+    public String getIccid() {
+        return deviceState.lastIccid;
+    }
+
     public String getCurrentBuild() {
         return deviceState.currentBuild;
     }
@@ -243,6 +251,29 @@ public Date getLastHeard() {
         return deviceState.lastHeard;
     }
 
+    @WorkerThread
+    public float getCurrentDataUsage() throws ParticleCloudException {
+        Response response = mainApi.getCurrentDataUsage(deviceState.lastIccid);
+        float maxUsage = 0;
+        try {
+            JSONObject result = new JSONObject(new String(((TypedByteArray) response.getBody()).getBytes()));
+            JSONArray usages = result.getJSONArray("usage_by_day");
+
+            for (int i = 0; i < usages.length(); i++) {
+                JSONObject usageElement = usages.getJSONObject(i);
+                if (usageElement.has("mbs_used_cumulative")) {
+                    double usage = usageElement.getDouble("mbs_used_cumulative");
+                    if (usage > maxUsage) {
+                        maxUsage = (float) usage;
+                    }
+                }
+            }
+        } catch (JSONException e) {
+            throw new ParticleCloudException(e);
+        }
+        return maxUsage;
+    }
+
     /**
      * Return the value for <code>variableName</code> on this Particle device.
      * <p>
@@ -509,7 +540,7 @@ public void onEvent(String eventName, ParticleEvent particleEvent) {
             throw new ParticleCloudException(e);
         }
     }
-  
+
     /**
      * Subscribes to system events of current device. Events emitted to EventBus listener.
      *
@@ -599,7 +630,7 @@ private void sendUpdateFlashChange(EventBus eventBus, String data) {
                 break;
         }
     }
-  
+
     @Override
     public String toString() {
         return "ParticleDevice{" +

cloudsdk/src/main/java/io/particle/android/sdk/cloud/Responses.java

@@ -56,6 +56,9 @@ public static class SimpleDevice {
 
             public final String imei;
 
+            @SerializedName("last_iccid")
+            public final String lastIccid;
+
             @SerializedName("current_build_target")
             public final String currentBuild;
 
@@ -81,13 +84,14 @@ public static class SimpleDevice {
             public final Date lastHeard;
 
             public SimpleDevice(String id, String name, boolean isConnected, boolean cellular,
-                                String imei, String currentBuild, String defaultBuild, int platformId,
+                                String imei, String lastIccid, String currentBuild, String defaultBuild, int platformId,
                                 int productId, String ipAddress, String status, Date lastHeard) {
                 this.id = id;
                 this.name = name;
                 this.isConnected = isConnected;
                 this.cellular = cellular;
                 this.imei = imei;
+                this.lastIccid = lastIccid;
                 this.currentBuild = currentBuild;
                 this.defaultBuild = defaultBuild;
                 this.platformId = platformId;
@@ -112,6 +116,9 @@ class CompleteDevice {
 
             public final String imei;
 
+            @SerializedName("last_iccid")
+            public final String lastIccid;
+
             @SerializedName("current_build_target")
             public final String currentBuild;
 
@@ -150,7 +157,7 @@ class CompleteDevice {
             public final Date lastHeard;
 
             CompleteDevice(String deviceId, String name, boolean isConnected, boolean cellular,
-                           String imei, String currentBuild, String defaultBuild,
+                           String imei, String lastIccid, String currentBuild, String defaultBuild,
                            Map<String, String> variables, List<String> functions, String version,
                            int productId, int platformId, String ipAddress, String lastAppName,
                            String status, boolean requiresUpdate, Date lastHeard) {
@@ -159,6 +166,7 @@ class CompleteDevice {
                 this.isConnected = isConnected;
                 this.cellular = cellular;
                 this.imei = imei;
+                this.lastIccid = lastIccid;
                 this.currentBuild = currentBuild;
                 this.defaultBuild = defaultBuild;
                 this.variables = variables;
@@ -260,7 +268,6 @@ public ClaimCodeResponse(String claimCode, String[] deviceIds) {
         }
     }
 
-
     public abstract static class ReadVariableResponse<T> {
 
         @SerializedName("cmd")