Merge pull request #14 from comapi/dev

integrate ver 1.2.0

Author: MarcinSwierczek

COMAPI/foundation/build.gradle

@@ -39,32 +39,27 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     /* Android */
-    compile 'com.android.support:appcompat-v7:26.0.1'
-
+    compile 'com.android.support:appcompat-v7:26.1.0'
     /* testing */
     testCompile 'junit:junit:4.12'
     androidTestCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.1.2'
-    testCompile "org.robolectric:shadows-play-services:3.1.2"
-    testCompile "org.robolectric:shadows-support-v4:3.1.2"
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
+    testCompile 'org.robolectric:robolectric:3.2.2'
+    testCompile 'org.robolectric:shadows-play-services:3.2.2'
+    testCompile 'org.robolectric:shadows-support-v4:3.2.2'
+    androidTestCompile 'com.android.support.test:runner:1.0.1'
+    androidTestCompile 'com.android.support.test:rules:1.0.1'
     testCompile 'com.squareup.okhttp3:mockwebserver:3.9.0'
-
+    /* Rx */
+    compile 'io.reactivex:rxjava:1.3.3'
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
     /* Network */
     compile 'com.squareup.retrofit2:retrofit:2.3.0'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
-
-    /* RxJava */
-    compile 'io.reactivex:rxjava:1.3.3'
-    compile 'io.reactivex:rxandroid:1.2.1'
-
     /*FCM*/
-    compile 'com.google.android.gms:play-services-base:11.4.2'
-    compile 'com.google.firebase:firebase-messaging:11.4.2'
-
+    compile 'com.google.android.gms:play-services-base:11.6.2'
+    compile 'com.google.firebase:firebase-messaging:11.6.2'
     /*Sockets*/
     compile 'com.neovisionaries:nv-websocket-client:2.3'
 }

COMAPI/foundation/src/main/java/com/comapi/BaseClient.java

@@ -97,7 +97,7 @@ public abstract class BaseClient<T> implements IClient<T> {
     /**
      * Adapter to dispatch events to multiple external listeners.
      */
-    private ListenerListAdapter listenerListAdapter;
+    protected ListenerListAdapter listenerListAdapter;
 
     /**
      * Recommended constructor.

COMAPI/foundation/src/main/java/com/comapi/BaseComapi.java

@@ -38,7 +38,7 @@ class BaseComapi {
     /**
      * Version of the ComapiImpl SDK MAJOR.MINOR.PATCH.BUILD
      */
-    private final static String SDK_VERSION = "1.1.1";
+    private final static String SDK_VERSION = "1.2.0";
 
     private static final Set<String> apiSpaces = Collections.synchronizedSet(new HashSet<String>());
 

COMAPI/foundation/src/main/java/com/comapi/StateListener.java

@@ -36,13 +36,26 @@ public abstract class StateListener implements IStateListener {
      *
      * @param session New session details.
      */
+    @Override
     public void onSessionStart(Session session) {}
 
     /**
-     * Socket started successfully.
+     * Socket started successfully. Received confirmation event from the server.
      *
      * @param event Socket started successfully event.
      */
+    @Override
     public void onSocketStart(SocketStartEvent event) {}
 
+    /**
+     * Socket disconnected.
+     */
+    @Override
+    public void onSocketDisconnected() {}
+
+    /**
+     * Socket connected.
+     */
+    @Override
+    public void onSocketConnected() {}
 }

COMAPI/foundation/src/main/java/com/comapi/internal/IStateListener.java

@@ -31,10 +31,19 @@
 public interface IStateListener extends ISessionListener {
 
     /**
-     * Socket started successfully.
+     * Socket connected successfully.
      *
      * @param event Socket started successfully event.
      */
     void onSocketStart(SocketStartEvent event);
 
+    /**
+     * Socket disconnected.
+     */
+    void onSocketConnected();
+
+    /**
+     * Socket disconnected.
+     */
+    void onSocketDisconnected();
 }

COMAPI/foundation/src/main/java/com/comapi/internal/ListenerListAdapter.java

@@ -132,6 +132,30 @@ public void onSocketStarted(SocketStartEvent event) {
         }
     }
 
+    public void onSocketConnected() {
+        log.d("TEST listener onSocketConnected triggered");
+        for (IStateListener listener : stateListeners) {
+            try {
+                log.d("TEST listener onSocketConnected listener found");
+                listener.onSocketConnected();
+            } catch (Exception e) {
+                logError(e, "socket connected");
+            }
+        }
+    }
+
+    public void onSocketDisconnected() {
+        log.d("TEST listener onSocketDisconnected triggered");
+        for (IStateListener listener : stateListeners) {
+            try {
+                log.d("TEST listener onSocketDisconnected listener found");
+                listener.onSocketDisconnected();
+            } catch (Exception e) {
+                logError(e, "socket disconnected");
+            }
+        }
+    }
+
     @Override
     public void onParticipantAdded(ParticipantAddedEvent event) {
         for (IMessagingListener listener : messagingListeners) {
@@ -292,6 +316,8 @@ public void removeListener(IProfileListener listener) {
     }
 
     private void logError(Exception e, String details) {
-        log.f("Couldn't deliver event ("+details+") Exception in external callback implementation.", e);
+        if (log != null) {
+            log.f("Couldn't deliver event (" + details + ") Exception in external callback implementation.", e);
+        }
     }
 }

COMAPI/foundation/src/main/java/com/comapi/internal/log/FormatterConsoleLog.java

@@ -32,11 +32,11 @@ class FormatterConsoleLog extends Formatter {
      * Formats log message for console output. Short version.
      *
      * @param msgLogLevel Message log level.
-     * @param clazz       Class name in which message was logged.
+     * @param module       SDK module details
      * @param msg         Log message.
      * @return Formatted log message.
      */
-    String formatMessage(int msgLogLevel, String clazz, String msg) {
-        return getLevelTag(msgLogLevel) + "[" + clazz + "]: " + msg;
+    String formatMessage(int msgLogLevel, String module, String msg) {
+        return getLevelTag(msgLogLevel) + module + ": " + msg;
     }
 }

COMAPI/foundation/src/main/java/com/comapi/internal/log/FormatterFileLog.java

@@ -41,9 +41,9 @@ class FormatterFileLog extends Formatter {
      */
     String formatMessage(int msgLogLevel, String tag, String msg, Throwable exception) {
         if (exception != null) {
-            return DateHelper.getUTC(System.currentTimeMillis()) + getLevelTag(msgLogLevel) + "[" + tag + "] " + msg + "\n" + getStackTrace(exception) + "\n";
+            return DateHelper.getUTC(System.currentTimeMillis()) + "/" + getLevelTag(msgLogLevel) + tag + ": " + msg + "\n" + getStackTrace(exception) + "\n";
         } else {
-            return DateHelper.getUTC(System.currentTimeMillis()) + getLevelTag(msgLogLevel) + "[" + tag + "] " + msg + "\n";
+            return DateHelper.getUTC(System.currentTimeMillis()) + "/" + getLevelTag(msgLogLevel) + tag + ": " + msg + "\n";
         }
     }
 

COMAPI/foundation/src/main/java/com/comapi/internal/log/LogConstants.java

@@ -31,31 +31,31 @@ public interface LogConstants {
     /**
      * Default tag for {@link Logger}s
      */
-    String TAG = "Comapi";
+    String TAG = "FDN";
 
     /**
      * See {@link LogLevel#FATAL}
      */
-    String TAG_FATAL = "[FATAL]";
+    String TAG_FATAL = "F/";
 
     /**
      * See {@link LogLevel#ERROR}
      */
-    String TAG_ERROR = "[ERROR]";
+    String TAG_ERROR = "E/";
 
     /**
      * See {@link LogLevel#WARNING}
      */
-    String TAG_WARNING = "[WARNING]";
+    String TAG_WARNING = "W/";
 
     /**
      * See {@link LogLevel#INFO}
      */
-    String TAG_INFO = "[INFO]";
+    String TAG_INFO = "I/";
 
     /**
      * See {@link LogLevel#DEBUG}
      */
-    String TAG_DEBUG = "[DEBUG]";
+    String TAG_DEBUG = "D/";
 
 }

COMAPI/foundation/src/main/java/com/comapi/internal/network/ComapiResult.java

@@ -78,7 +78,7 @@ protected ComapiResult(T result, boolean isSuccessful, String eTag, int code, St
             if (response.errorBody() != null) {
                 errorBody = response.errorBody().string();
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }