-Fix re-subscribe problem

BboxLab · Apr 18, 2017 · 8478d53 · 8478d53
1 parent 2ff7e9f
commit 8478d53
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ 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.0-release.aar** to your lib folder of your project
+add **bboxapi-library-1.1-release.aar** to your lib folder of your project
 add this line to your gradle dependencies  
 ````
 compile(name: 'bboxapi-debug', ext: 'aar')
@@ -16,13 +16,13 @@ compile(name: 'bboxapi-debug', ext: 'aar')
 <dependency>
   <groupId>fr.bouyguestelecom.dev</groupId>
   <artifactId>bboxapi</artifactId>
-  <version>1.0</version>
+  <version>1.1</version>
   <type>pom</type>
 </dependency>
 ````
 3 -jcenter
 ````
-compile 'fr.bouyguestelecom.dev:bboxapi:1.0'
+compile 'fr.bouyguestelecom.dev:bboxapi:1.1'
 ````
 ### Prerequisites
 

diff --git a/bboxapi/bboxapi.iml b/bboxapi/bboxapi.iml
@@ -77,18 +77,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <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" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <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 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="okio-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="okhttp-3.3.1" level="project" />

diff --git a/bboxapi/build.gradle b/bboxapi/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
     }
     buildTypes {
         release {

diff --git a/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/Bbox.java b/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/Bbox.java
@@ -640,28 +640,19 @@ public void onFailure(Request request, int errorCode) {
 
     @Override
     public String addListener(String ip, final String appId, IBboxMedia iBboxMedia) {
-        if (mWebSocket == null) {
             mWebSocket = new WebSocket(ip, appId);
-        }
-
         return mWebSocket.addNotifChannelListener(iBboxMedia);
     }
 
     @Override
     public String addListener(String ip, String appId, IBboxApplication iBboxApplication) {
-        if (mWebSocket == null) {
             mWebSocket = new WebSocket(ip, appId);
-        }
-
         return mWebSocket.addNotifApplication(iBboxApplication);
     }
 
     @Override
     public String addListener(String ip, String appId, IBboxMessage iBboxMessage) {
-        if (mWebSocket == null) {
             mWebSocket = new WebSocket(ip, appId);
-        }
-
         return mWebSocket.addNotifMessage(iBboxMessage);
     }
 

diff --git a/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/ws/WebSocket.java b/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/ws/WebSocket.java
@@ -98,7 +98,6 @@ public void onMessage(String message) {
                         }
                     }
 
-
                     if (obj.get("resourceId").toString().contains("Iot")) {
 
                         MessageResource messageResource = new MessageResource(obj.getJSONObject("body").get("source").toString(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,6 @@ public void onMessage(String message) { @@
                             }
                         }
                         if (obj.get("resourceId").toString().contains("Iot")) {
                             MessageResource messageResource = new MessageResource(obj.getJSONObject("body").get("source").toString(),
@@ Expand Down @@