WIP: Android not triggering callbacks

Author: auser

android/src/main/java/io/fullstack/firestack/FirestackCloudMessaging.java

@@ -83,8 +83,9 @@ private void initRefreshTokenHandler() {
             public void onReceive(Context context, Intent intent) {
                 WritableMap params = Arguments.createMap();
                 params.putString("token", intent.getStringExtra("token"));
-                FirestackUtils.sendEvent(mReactContext, EVENT_NAME_TOKEN, params);
-
+                ReactContext ctx = getReactApplicationContext();
+                Log.d(TAG, "initRefreshTokenHandler received event " + EVENT_NAME_TOKEN);
+                FirestackUtils.sendEvent(ctx, EVENT_NAME_TOKEN, params);
             }
 
             ;
@@ -149,7 +150,8 @@ public void onReceive(Context context, Intent intent) {
                 } else {
                     params.putNull("notification");
                 }
-                FirestackUtils.sendEvent(mReactContext, EVENT_NAME_NOTIFICATION, params);
+                ReactContext ctx = getReactApplicationContext();
+                FirestackUtils.sendEvent(ctx, EVENT_NAME_NOTIFICATION, params);
             }
         }, mReceiveNotificationIntentFilter);
     }
@@ -197,7 +199,8 @@ public void onReceive(Context context, Intent intent) {
                 } else {
                     params.putNull("err");
                 }
-                FirestackUtils.sendEvent(mReactContext, EVENT_NAME_SEND, params);
+                ReactContext ctx = getReactApplicationContext();
+                FirestackUtils.sendEvent(ctx, EVENT_NAME_SEND, params);
             }
         }, mReceiveSendIntentFilter);
     }

android/src/main/java/io/fullstack/firestack/FirestackDatabase.java

@@ -97,11 +97,13 @@ public void addValueEventListener(final String name, final ReadableArray modifie
     mValueListener = new ValueEventListener() {
       @Override
       public void onDataChange(DataSnapshot dataSnapshot) {
+        Log.d(TAG, "onDataChange called for " + name);
         self.handleDatabaseEvent("value", dataSnapshot);
       }
 
       @Override
       public void onCancelled(DatabaseError error) {
+        Log.d(TAG, "onDataChange onCancelled called");
         self.handleDatabaseError("value", error);
       }
     };
@@ -157,14 +159,17 @@ public void removeValueEventListener() {
   }
 
   private void handleDatabaseEvent(final String name, final DataSnapshot dataSnapshot) {
+    Log.d(TAG, "handleDatabaseEvent called: " + name);
     WritableMap data = FirestackUtils.dataSnapshotToMap(name, dataSnapshot);
     WritableMap evt  = Arguments.createMap();
     evt.putString("eventName", name);
     evt.putMap("body", data);
+    
     FirestackUtils.sendEvent(mReactContext, "database_event", evt);
   }
 
   private void handleDatabaseError(final String name, final DatabaseError error) {
+    Log.d(TAG, "handleDatabaseError called: " + name);
     WritableMap err = Arguments.createMap();
     err.putInt("errorCode", error.getCode());
     err.putString("errorDetails", error.getDetails());
@@ -173,6 +178,7 @@ private void handleDatabaseError(final String name, final DatabaseError error) {
     WritableMap evt  = Arguments.createMap();
     evt.putString("eventName", name);
     evt.putMap("body", err);
+
     FirestackUtils.sendEvent(mReactContext, "database_error", evt);
   }
 
@@ -540,7 +546,8 @@ private void handleCallback(
 
   private FirestackDBReference getDBHandle(final String path) {
     if (!mDBListeners.containsKey(path)) {
-      mDBListeners.put(path, new FirestackDBReference(mReactContext, path));
+      ReactContext ctx = getReactApplicationContext();
+      mDBListeners.put(path, new FirestackDBReference(ctx, path));
     }
 
     return mDBListeners.get(path);

android/src/main/java/io/fullstack/firestack/FirestackUtils.java

@@ -36,11 +36,16 @@ public static void todoNote(final String tag, final String name, final Callback
   * send a JS event
   **/
   public static void sendEvent(final ReactContext context,
-    String eventName,
-    WritableMap params) {
+    final String eventName,
+    final WritableMap params) {
+    if (context.hasActiveCatalystInstance()) {
+      Log.d(TAG, "Sending event " + eventName);
       context
           .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
           .emit(eventName, params);
+    } else {
+      Log.d(TAG, "Waiting for CatalystInstance before sending event");
+    }
   }
 
   // snapshot

lib/modules/presence.js

@@ -12,10 +12,11 @@ class PresenceRef extends ReferenceBase {
     this._onConnect = [];
   }
 
-  setOnlineFor(path) {
-    const connectedDeviceRef = this.ref.child(path)
+  setOnline(path) {
+    const connectedDeviceRef = path ? this.ref.child(path) : this.ref;
     this._lastOnlineRef = connectedDeviceRef.child('lastOnline');
 
+    this.connectedDeviceRef = connectedDeviceRef;
     this._connectedRef.on('value', (snapshot) => {
       const val = snapshot.val();
       if (val) {
@@ -25,13 +26,7 @@ class PresenceRef extends ReferenceBase {
           online: true
         })
           .then(() => {
-            connectedDeviceRef.onDisconnect()
-              .setValue({
-                online: false
-              });
-
-            this._lastOnlineRef.onDisconnect()
-              .setValue(this.firestack.ServerValue.TIMESTAMP)
+            this._disconnect(true);
 
             this._onConnect.forEach(fn => {
               if (fn && typeof fn === 'function') {
@@ -40,11 +35,32 @@ class PresenceRef extends ReferenceBase {
             })
           })
       }
-    })
+    });
+    return this;
+  }
+
+  setOffline() {
+    this._disconnect();
+  }
+
+  _disconnect(onDisconnect) {
+    if (onDisconnect) {
+      this.connectedDeviceRef.onDisconnect()
+        .setValue({online: false});
+      // set last online time
+      this._lastOnlineRef.onDisconnect()
+        .setValue(this.firestack.ServerValue.TIMESTAMP)
+    } else {
+      this.connectedDeviceRef
+        .setValue({online: false});
+      this._lastOnlineRef
+        .setValue(this.firestack.ServerValue.TIMESTAMP)
+    }
   }
 
   onConnect(cb) {
     this._onConnect.push(cb);
+    return this;
   }
 
 }