-Update bbox change where we open websocket

-Add websocket isClose()

Author: gun95

README.md

@@ -6,23 +6,23 @@ This is the basic SDK for your own application if you want to make use of BboxAP
 
 1 -jar file
 clone the depot and build
-add **bboxapi-library-1.1-release.aar** to your lib folder of your project
+add **bboxapi-library-1.2-release.aar** to your lib folder of your project
 add this line to your gradle dependencies  
 ````
-compile(name: 'bboxapi-debug', ext: 'aar')
+compile(name: 'bboxapi-library-1.2-release.aar', ext: 'aar')
 ````
 2 -maven
 ````
 <dependency>
   <groupId>fr.bouyguestelecom.dev</groupId>
   <artifactId>bboxapi</artifactId>
-  <version>1.1</version>
+  <version>1.2</version>
   <type>pom</type>
 </dependency>
 ````
 3 -jcenter
 ````
-compile 'fr.bouyguestelecom.dev:bboxapi:1.1'
+compile 'fr.bouyguestelecom.dev:bboxapi:1.2'
 ````
 ### Prerequisites
 

bboxapi/bboxapi.iml

@@ -81,7 +81,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -94,6 +93,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />

bboxapi/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 2
-        versionName "1.1"
+        versionName "1.2"
     }
     buildTypes {
         release {

bboxapi/proguard-rules.pro

@@ -19,6 +19,7 @@
 import tv.bouyguestelecom.fr.bboxapilibrary.callback.IBboxApplication;
 import tv.bouyguestelecom.fr.bboxapilibrary.callback.IBboxMedia;
 import tv.bouyguestelecom.fr.bboxapilibrary.callback.IBboxMessage;
+import tv.bouyguestelecom.fr.bboxapilibrary.callback.IBboxSubscribe;
 import tv.bouyguestelecom.fr.bboxapilibrary.model.ApplicationResource;
 import tv.bouyguestelecom.fr.bboxapilibrary.model.MediaResource;
 import tv.bouyguestelecom.fr.bboxapilibrary.model.MessageResource;
@@ -36,26 +37,23 @@ public class WebSocket {
 
     private String mAppId;
     private String mWebsocketAddress;
+    private final IBboxSubscribe iBboxSubscribe;
 
-    public WebSocket(String ip, String appId) {
+    public WebSocket(String ip, String appId, IBboxSubscribe iBboxSubscribe) {
         mAppId = appId;
         mWebsocketAddress = WEBSOCKET_PREFIX + ip + ":" + WEBSOCKET_PORT;
+        this.iBboxSubscribe = iBboxSubscribe;
         init();
     }
 
-    public static WebSocket getInstance(String appId, Bbox bbox) {
-        if(instance == null) {
-            instance = new WebSocket(appId, appId);
-        }
-
-        return instance;
-    }
-
     private void init() {
         mWebSocketClient = new WebSocketClient(URI.create(mWebsocketAddress)) {
             @Override
             public void onOpen(ServerHandshake handshakedata) {
                 mWebSocketClient.send(mAppId);
+                if (iBboxSubscribe != null) {
+                    iBboxSubscribe.onSubscribe();
+                }
             }
 
             @Override
@@ -87,11 +85,12 @@ public void onMessage(String message) {
 
                     if (obj.get("resourceId").toString().contains("Message") || obj.get("resourceId").toString().contains(".")) {
 
-                        MessageResource messageResource = new MessageResource(obj.getJSONObject("body").get("source").toString(),
-                                obj.getJSONObject("body").get("message").toString());
+                        JSONObject body = obj.getJSONObject("body");
+                        MessageResource messageResource = new MessageResource(body.get("source").toString(),
+                                body.getString("message"));
 
-                        for (Map.Entry<String, IBboxMessage> iMsgListenerEntry : Bbox.getInstance().getNotifMsg().getMap().entrySet()) {
-                            iMsgListenerEntry.getValue().onNewMessage(messageResource);
+                        for (IBboxMessage msg : Bbox.getInstance().getNotifMsg().getMap().values()) {
+                            msg.onNewMessage(messageResource);
                         }
                     }
 
@@ -117,7 +116,7 @@ public void onClose(int code, String reason, boolean remote) {
 
             @Override
             public void onError(Exception ex) {
-                Log.e(TAG, "onError");
+                Log.e(TAG, "onError", ex);
             }
         };
 
@@ -130,6 +129,13 @@ public void close() {
         }
     }
 
-
-
+    public boolean isClosed() {
+        if (mWebSocketClient != null) {
+            org.java_websocket.WebSocket realWebSocket = mWebSocketClient.getConnection();
+            if (realWebSocket != null) {
+                return realWebSocket.isClosed();
+            }
+        }
+        return true;
+    }
 }

bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/Bbox.java

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong

bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/ws/WebSocket.java

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip