adding logging and promise (#3)

* resolve promise with relevant messages

* adding logging

android/src/main/java/com/wearconnectivity/WearConnectivityModule.java

@@ -2,6 +2,7 @@
 
 import static com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks.CAUSE_NETWORK_LOST;
 
+import android.util.Log;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -14,6 +15,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.util.RNLog;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
@@ -28,13 +30,14 @@
 public class WearConnectivityModule extends WearConnectivitySpec
     implements MessageClient.OnMessageReceivedListener, LifecycleEventListener {
   public static final String NAME = "WearConnectivity";
-  private static final String TAG = "WearConnectivityModule";
+  private static final String TAG = "WearConnectivityModule ";
   private final MessageClient client;
 
   WearConnectivityModule(ReactApplicationContext context) {
     super(context);
     context.addLifecycleEventListener(this);
     client = Wearable.getMessageClient(context);
+    Log.d(TAG, TAG + "onMessageReceived listener added when activity is created. Client receives messages.");
     client.addListener(this);
   }
 
@@ -51,27 +54,28 @@ public void multiply(double a, double b, Promise promise) {
     promise.resolve(a * b);
   }
 
-  // catch the ExecutionException
   @ReactMethod
   public void sendMessage(String path, Promise promise) {
     try {
       NodeClient nodeClient = Wearable.getNodeClient(getReactApplicationContext());
       List<Node> nodes = Tasks.await(nodeClient.getConnectedNodes());
       if (nodes.size() > 0) {
         for (Node node : nodes) {
-          sendMessageToClient(path, node);
+          // TODO: Add check that node is listening (companion app activity is used)
+          // https://developers.google.com/android/reference/com/google/android/gms/wearable/Node
+          if (node.isNearby()) {
+            sendMessageToClient(path, node, promise);
+          }
         }
-        promise.resolve(true);
       } else {
-        Toast.makeText(getReactApplicationContext(), "No connected nodes found", Toast.LENGTH_LONG)
-            .show();
+        promise.reject(TAG, TAG + "sendMessage failed. No connected nodes found.");
       }
     } catch (Exception e) {
-      FLog.w(TAG, " getConnectedNodes raised Exception: " + e);
+      promise.reject(TAG, TAG + "sendMessage failed with exception: " + e);
     }
   }
 
-  private void sendMessageToClient(String path, Node node) {
+  private void sendMessageToClient(String path, Node node, Promise promise) {
     try {
       Task<Integer> sendTask =
           Wearable.getMessageClient(getReactApplicationContext())
@@ -80,25 +84,25 @@ private void sendMessageToClient(String path, Node node) {
           new OnSuccessListener<Object>() {
             @Override
             public void onSuccess(Object object) {
-              FLog.d(TAG, " sendMessage called onSuccess for path: " + path);
+              promise.resolve(TAG + "message sent to client with nodeID: " + object.toString());
             }
           };
       sendTask.addOnSuccessListener(onSuccessListener);
       OnFailureListener onFailureListener =
           new OnFailureListener() {
             @Override
             public void onFailure(@NonNull Exception e) {
-              FLog.d(TAG, " sendMessage called onFailure with error: " + e);
+              promise.reject(TAG, TAG + "sendMessage failed: " + e);
             }
           };
       sendTask.addOnFailureListener(onFailureListener);
     } catch (Exception e) {
-      FLog.w(TAG, " sendMessage raised Exception: " + e);
+      promise.reject(TAG, TAG + "sendMessage failed: " + e);
     }
   }
 
   public void onMessageReceived(MessageEvent messageEvent) {
-    FLog.d(TAG, " onMessageReceived called for path: " + messageEvent.getPath());
+    Log.d(TAG, TAG + "onMessageReceived received message with path: " + messageEvent.getPath());
     sendEvent(getReactApplicationContext(), messageEvent.getPath(), null);
   }
 
@@ -112,17 +116,20 @@ private void sendEvent(
   @Override
   public void onHostResume() {
     if (client != null) {
+      Log.d(TAG, TAG + "onMessageReceived listener added when activity is resumed. Client receives messages.");
       client.addListener(this);
     }
   }
 
   @Override
   public void onHostPause() {
+    Log.d(TAG, TAG + "onMessageReceived listener removed when the activity paused. Client does not receive messages.");
     client.removeListener(this);
   }
 
   @Override
   public void onHostDestroy() {
+    Log.d(TAG, TAG + "onMessageReceived listener removed when activity is destroyed. Client does not receive messages.");
     client.removeListener(this);
   }
 }

example/src/App.tsx

@@ -14,9 +14,6 @@ const App = () => {
     <>
       <LoginScreen />
       <WearScreen />
-      <View style={styles.container}>
-        <Text>Result: {result}</Text>
-      </View>
     </>
   );
 };

example/src/LoginScreen.tsx

@@ -7,7 +7,7 @@ import {
   NativeModules,
   Button,
 } from 'react-native';
-import {GoogleSignin} from '@react-native-google-signin/google-signin';
+import { GoogleSignin } from '@react-native-google-signin/google-signin';
 import Config from 'react-native-config';
 
 export default function LoginScreen() {
@@ -19,7 +19,7 @@ export default function LoginScreen() {
       const userInfo = await GoogleSignin.signIn();
       console.log(JSON.stringify(userInfo));
     } catch (error) {
-      console.log('ERROR IS: ' + JSON.stringify(error));
+      console.log('GoogleSignin faile with error: ' + JSON.stringify(error));
     }
   };
 

example/src/WearScreen.tsx

@@ -32,8 +32,9 @@ export default function WearCounter() {
     };
   }, []);
 
-  const onPressHandler = () => {
-    sendMessage(INCREASE_WEAR_COUNTER_EVENT);
+  const onPressHandler = async () => {
+    const result = await sendMessage(INCREASE_WEAR_COUNTER_EVENT);
+    console.log(result);
   };
 
   return (