Merge pull request #26 from JoaoCaixinha/master

added getIsConnected

Author: jparreira

README.md

@@ -54,6 +54,11 @@ Push Notifications only work in real devices for the iOS platform (not on simula
 *  **disconnect(callback())**
 
     This method is used to disconnect the ORTC connection.
+    
+*	**getIsConnected(callback(state))**
+	
+	Gets ortc client connection state.
+	Returns callback state 0 if not connected and 1 connected.	
 
     *   callback() - is triggered after connection is disconnected.
 *  **subscribe(channel, callback())**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordovapush",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "This Cordova plugin should be used with the iOS/Android platforms together with the Realtime Messaging library (ORTC) for Push Notifications support.",
   "main": "index.js",
   "scripts": {

plugin.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     id="co.realtime.plugins.CordovaPush"
-    version="0.1.28">
+    version="0.1.29">
 
   <name>cordovapush</name>
 	<author>Reatime</author>

src/android/OrtcPushPlugin.java

@@ -42,6 +42,7 @@ public class OrtcPushPlugin extends CordovaPlugin {
     public static final String ACTION_SEND_MESSAGE = "send";
     private static final String ACTION_ENABLE_HEADS_UP_NOTIFICATIONS = "enableHeadsUpNotifications";
     private static final String ACTION_DISABLE_HEADS_UP_NOTIFICATIONS = "disableHeadsUpNotifications";
+    private static final String ACTION_GET_CONNECTION_STATE = "getIsConnected";
     private OrtcClient client;
     private static CordovaWebView gWebView;
     private static Bundle gCachedExtras = null;
@@ -78,7 +79,9 @@ public void run(OrtcClient ortcClient) {
             client.onDisconnected = new OnDisconnected() {
                 @Override
                 public void run(OrtcClient ortcClient) {
-                    Log.i(TAG,"Disconnected" );
+                    CallbackContext call = (CallbackContext)commands.get(ACTION_DISCONNECT);
+                    if (call != null)
+                        call.success();
                 }
             };
 
@@ -101,7 +104,6 @@ public void run(OrtcClient ortcClient, String s) {
                 }
             };
 
-
             client.onReconnected = new OnReconnected(){
                 @Override
                 public void run(OrtcClient sender) {
@@ -158,6 +160,11 @@ public boolean execute(String action, JSONArray args, final CallbackContext call
                 callbackContext.success();
                 return true;
             }
+            else if(ACTION_GET_CONNECTION_STATE.equals(action)){
+                int isConnected = client.getIsConnected()? 1: 0;
+                callbackContext.success(isConnected);
+                return true;
+            }
             else if(ACTION_CONNECT.equals(action)){
                 commands.put(ACTION_CONNECT, callbackContext);
                 cordova.getThreadPool().execute(new Runnable() {

src/ios/OrtcPushPlugin.h

@@ -21,6 +21,7 @@
 - (void)removeNotifications:(CDVInvokedUrlCommand*)command;
 - (void)connect:(CDVInvokedUrlCommand*)command;
 - (void)disconnect:(CDVInvokedUrlCommand*)command;
+- (void)getIsConnected:(CDVInvokedUrlCommand*)command;
 - (void)subscribe:(CDVInvokedUrlCommand*)command;
 - (void)unsubscribe:(CDVInvokedUrlCommand*)command;
 - (void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command;

src/ios/OrtcPushPlugin.m

@@ -44,6 +44,15 @@ - (void)disconnect:(CDVInvokedUrlCommand*)command
 
 }
 
+- (void)getIsConnected:(CDVInvokedUrlCommand*)command
+{
+    [_connectCommand setObject:command forKey:@"getIsConnected"];
+    CDVPluginResult* pluginResult = nil;
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:[_ortc isConnected]];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:[[_connectCommand objectForKey:@"getIsConnected"] callbackId]];
+}
+
+
 - (void)trowException:(NSString*)exception forCommand:(CDVInvokedUrlCommand*)command code:(void (^)(CDVInvokedUrlCommand*))code{
     if (!_ortc) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"onException" object:nil userInfo:@{@"exception":exception}];

www/OrtcPlugin.js

@@ -15,6 +15,10 @@
    cordova.exec(success, success, "OrtcPushPlugin", "connect", config ? [config] : []);
   };
 
+  OrtcPushPlugin.prototype.getIsConnected = function(success) {
+    cordova.exec(success, success, "OrtcPushPlugin", "getIsConnected", []);
+  };
+
   OrtcPushPlugin.prototype.enableHeadsUpNotifications = function(config, success) {
     cordova.exec(success, success, "OrtcPushPlugin", "enableHeadsUpNotifications", []);
   };