Merge pull request #1158 from Roomify/android-arrayRemove-object

#1157: Allow objects in arrayRemove on android

Author: EddyVerbruggen

demo-ng/app/tabs/firestore/firestore.component.ts

@@ -254,7 +254,12 @@ export class FirestoreComponent {
         .update({
           last: "Updated From 'arrayRemove'",
           updateTs: firebase.firestore().FieldValue().serverTimestamp(),
-          colors: firebase.firestore().FieldValue().arrayRemove("red")
+          colors: firestore.FieldValue.arrayUnion("red"),
+          messages: firebase.firestore().FieldValue().arrayRemove({
+            message: "Test 1",
+            source: "central",
+            time: Date.now()
+          })
         })
         .then(() => console.log("Woofie updated from 'arrayRemove'"))
         .catch(err => console.log("Updating Woofie from 'arrayRemove' failed, error: " + JSON.stringify(err)));

src/firebase.android.ts

@@ -146,7 +146,9 @@ firebase.toHashMap = obj => {
             values = values.map(v => typeof (v) === "object" ? firebase.toHashMap(v) : v);
             node.put(property, com.google.firebase.firestore.FieldValue.arrayUnion(values));
           } else if (fieldValue.type === "ARRAY_REMOVE") {
-            node.put(property, com.google.firebase.firestore.FieldValue.arrayRemove(Array.isArray(fieldValue.value[0]) ? fieldValue.value[0] : fieldValue.value));
+            let values: Array<any> = Array.isArray(fieldValue.value[0]) ? fieldValue.value[0] : fieldValue.value;
+            values = values.map(v => typeof (v) === "object" ? firebase.toHashMap(v) : v);
+            node.put(property, com.google.firebase.firestore.FieldValue.arrayRemove(values));
           } else {
             console.log("You found a bug! Please report an issue at https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues, mention fieldValue.type = '" + fieldValue.type + "'. Thanks!");
           }