#594 Android - Background notification causing app to crash after upgrade to 5.1.1

EddyVerbruggen · EddyVerbruggen · commit f6972433dea4 · 2018-01-08T19:51:07.000+01:00
#595 Creating Observables from Firestore Documents/Collections
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@
 [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
 
+## 5.1.2 (2018, January 8)
+
+### Fixes
+- [#594](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/594) Android - Background notification causing app to crash after upgrade to 5.1.1
+
+### New
+- [#595](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/595) Creating Observables from Firestore Documents/Collections
+
+
 ## 5.1.1 (2017, December 30)
 
 ### Fixes
diff --git a/demo-ng/app/item/items.component.html b/demo-ng/app/item/items.component.html
@@ -11,13 +11,26 @@
     <Label text="Realtime DB" class="h2"></Label>
     <Button text="Get companies" (tap)="doWebGetValueForCompanies()" class="button"></Button>
 
+
+
+
     <Label text="Firestore" class="h2"></Label>
     <Button text="Add" (tap)="firestoreAdd()" class="button"></Button>
     <Button text="Set" (tap)="firestoreSet()" class="button"></Button>
     <Button text="Set (auto id)" (tap)="firestoreSetByAutoID()" class="button"></Button>
     <Button text="Update" (tap)="firestoreUpdate()" class="button"></Button>
     <Button text="Get" (tap)="firestoreGet()" class="button"></Button>
     <Button text="Get nested" (tap)="firestoreGetNested()" class="button"></Button>
+    <Button text="Document Observable (SF)" (tap)="firestoreDocumentObservable()" class="button"></Button>
+    <Label [text]="(myCity$ | async).name" height="32" *ngIf="myCity$"></Label>
+    <Button text="Collection Observable (cities)" (tap)="firestoreCollectionObservable()" class="button"></Button>
+    <ListView [items]="myCities$ | async" height="200" *ngIf="myCities$">
+      <template let-item="item">
+        <StackLayout>
+          <Label style="color: red" [text]='item.name'></Label>
+        </StackLayout>
+      </template>
+    </ListView>
     <Button text="Listen to changes in SF" (tap)="firestoreListen()" class="button"></Button>
     <Button text="Stop listening" (tap)="firestoreStopListening()" class="button"></Button>
     <Button text="Where" (tap)="firestoreWhere()" class="button"></Button>
diff --git a/demo-ng/app/item/items.component.ts b/demo-ng/app/item/items.component.ts
@@ -1,7 +1,11 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, NgZone, OnInit } from "@angular/core";
 import { firestore } from "nativescript-plugin-firebase";
+import { Observable } from "rxjs/Observable";
+import { City } from "../model/City";
+
 const firebase = require("nativescript-plugin-firebase/app");
 const firebaseWebApi = require("nativescript-plugin-firebase/app");
+
 // import { AngularFireModule } from 'angularfire2';
 
 @Component({
@@ -13,14 +17,21 @@ export class ItemsComponent implements OnInit {
 
   private listenerUnsubscribe: () => void;
 
-  constructor() {
+  public myCity$: Observable<City>;
+  public myCities$: Observable<Array<City>>;
+  private city: City;
+  private cities: Array<City> = [];
+
+  constructor(private zone: NgZone) {
     // AngularFireModule.initializeApp({});
   }
 
   ngOnInit(): void {
     firebase.initializeApp({
       persist: false
-    }).then(() => console.log("Firebase initialized"));
+    }).then(() => {
+      console.log("Firebase initialized");
+    });
   }
 
   public loginAnonymously(): void {
@@ -147,7 +158,7 @@ export class ItemsComponent implements OnInit {
             .doc("SF")
             .collection("streets")
             .doc("QZNrg22tkN8W71YC3qCb"); // id of 'main st.'
-            // .doc("doesntexist");
+    // .doc("doesntexist");
 
     mainStreetInSFDocRef.get().then((doc: firestore.DocumentSnapshot) => {
       if (doc.exists) {
@@ -160,6 +171,32 @@ export class ItemsComponent implements OnInit {
     });
   }
 
+
+  firestoreDocumentObservable(): void {
+    this.myCity$ = Observable.create(subscriber => {
+      const docRef: firestore.DocumentReference = firebase.firestore().collection("cities").doc("SF");
+      docRef.onSnapshot((doc: firestore.DocumentSnapshot) => {
+        this.zone.run(() => {
+          this.city = <City>doc.data();
+          subscriber.next(this.city);
+        });
+      });
+    });
+  }
+
+  firestoreCollectionObservable(): void {
+    this.myCities$ = Observable.create(subscriber => {
+      const colRef: firestore.CollectionReference = firebase.firestore().collection("cities");
+      colRef.onSnapshot((snapshot: firestore.QuerySnapshot) => {
+        this.zone.run(() => {
+          this.cities = [];
+          snapshot.forEach(docSnap => this.cities.push(<City>docSnap.data()));
+          subscriber.next(this.cities);
+        });
+      });
+    });
+  }
+
   public firestoreListen(): void {
     if (this.listenerUnsubscribe !== undefined) {
       console.log("Already listening ;)");
diff --git a/demo-ng/app/model/City.ts b/demo-ng/app/model/City.ts
@@ -0,0 +1,5 @@
+export interface City {
+  country: string;
+  name: string;
+  population: number;
+}
diff --git a/demo-ng/package.json b/demo-ng/package.json
@@ -5,10 +5,10 @@
   "repository": "<fill-your-repository-here>",
   "nativescript": {
     "id": "org.nativescript.firebasedemo.firestore",
-    "tns-android": {
+    "tns-ios": {
       "version": "3.4.0"
     },
-    "tns-ios": {
+    "tns-android": {
       "version": "3.4.0"
     }
   },
@@ -24,7 +24,7 @@
     "angularfire2": "^5.0.0-rc.4",
     "firebase": "^4.6.2",
     "nativescript-angular": "~4.4.0",
-    "nativescript-plugin-firebase": "5.1.1",
+    "nativescript-plugin-firebase": "5.1.2",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
     "rxjs": "~5.4.2",
diff --git a/demo/package.json b/demo/package.json
@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "5.1.1",
+    "nativescript-plugin-firebase": "5.1.2",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "~3.4.0"
diff --git a/src/firebase.android.ts b/src/firebase.android.ts
@@ -98,10 +98,10 @@ firebase.toHashMap = obj => {
       if (obj[property] === null) {
         node.put(property, null);
       } else {
-        if(obj[property] instanceof Date) {
-            node.put(property, new java.util.Date(obj[property].getTime()));
-        } else if (Array.isArray(obj[property])){
-            node.put(property, firebase.toJavaArray(obj[property]));
+        if (obj[property] instanceof Date) {
+          node.put(property, new java.util.Date(obj[property].getTime()));
+        } else if (Array.isArray(obj[property])) {
+          node.put(property, firebase.toJavaArray(obj[property]));
         } else {
           switch (typeof obj[property]) {
             case 'object':
@@ -128,8 +128,8 @@ firebase.toHashMap = obj => {
 };
 
 firebase.toJavaArray = val => {
-  var javaArray = new java.util.ArrayList();
-  for(var i = 0; i < val.length; i++) {
+  const javaArray = new java.util.ArrayList();
+  for (let i = 0; i < val.length; i++) {
     javaArray.add(firebase.toValue(val[i]));
   }
   return javaArray;
@@ -139,10 +139,10 @@ firebase.toValue = val => {
   let returnVal = null;
   if (val !== null) {
 
-    if(val instanceof Date) {
+    if (val instanceof Date) {
       return new java.util.Date(val.getTime());
     }
-    if(Array.isArray(val)) {
+    if (Array.isArray(val)) {
       return firebase.toJavaArray(val);
     }
 
@@ -220,6 +220,11 @@ firebase.authStateListener = null;
 
 firebase.init = arg => {
   return new Promise((resolve, reject) => {
+    if (firebase.initialized) {
+      reject("Firebase already initialized");
+    }
+    firebase.initialized = true;
+
     const runInit = () => {
       arg = arg || {};
 
@@ -230,18 +235,24 @@ firebase.init = arg => {
 
         const fDatabase = com.google.firebase.database.FirebaseDatabase;
         if (arg.persist) {
-          fDatabase.getInstance().setPersistenceEnabled(true);
+          try {
+            fDatabase.getInstance().setPersistenceEnabled(true);
+          } catch (ignore) {
+          }
         }
         firebase.instance = fDatabase.getInstance().getReference();
       }
 
       if (typeof(com.google.firebase.firestore) !== "undefined") {
         // Firestore has offline persistence enabled by default
         if (!arg.persist) {
-          com.google.firebase.firestore.FirebaseFirestore.getInstance().setFirestoreSettings(
-              new com.google.firebase.firestore.FirebaseFirestoreSettings.Builder()
-                  .setPersistenceEnabled(false)
-                  .build());
+          try {
+            com.google.firebase.firestore.FirebaseFirestore.getInstance().setFirestoreSettings(
+                new com.google.firebase.firestore.FirebaseFirestoreSettings.Builder()
+                    .setPersistenceEnabled(false)
+                    .build());
+          } catch (ignore) {
+          }
         }
       }
 
@@ -2230,7 +2241,8 @@ firebase.firestore.collection = (collectionPath: string): firestore.CollectionRe
       get: () => firebase.firestore.get(collectionPath),
       where: (fieldPath: string, opStr: firestore.WhereFilterOp, value: any) => firebase.firestore.where(collectionPath, fieldPath, opStr, value),
       orderBy: (fieldPath: string, directionStr: firestore.OrderByDirection): firestore.Query => firebase.firestore.orderBy(collectionPath, fieldPath, directionStr, collectionRef),
-      limit: (limit: number): firestore.Query => firebase.firestore.limit(collectionPath, limit, collectionRef)
+      limit: (limit: number): firestore.Query => firebase.firestore.limit(collectionPath, limit, collectionRef),
+      onSnapshot: (callback: (snapshot: QuerySnapshot) => void) => firebase.firestore.onCollectionSnapshot(collectionRef, callback)
     };
 
   } catch (ex) {
@@ -2239,7 +2251,7 @@ firebase.firestore.collection = (collectionPath: string): firestore.CollectionRe
   }
 };
 
-firebase.firestore.onSnapshot = (docRef: com.google.firebase.firestore.DocumentReference, callback: (doc: DocumentSnapshot) => void): ()=> void => {
+firebase.firestore.onDocumentSnapshot = (docRef: com.google.firebase.firestore.DocumentReference, callback: (doc: DocumentSnapshot) => void): () => void => {
   const listener = docRef.addSnapshotListener(new com.google.firebase.firestore.EventListener({
         onEvent: ((snapshot: com.google.firebase.firestore.DocumentSnapshot, exception) => {
           if (exception !== null) {
@@ -2256,6 +2268,28 @@ firebase.firestore.onSnapshot = (docRef: com.google.firebase.firestore.DocumentR
   return () => listener.remove();
 };
 
+firebase.firestore.onCollectionSnapshot = (colRef: com.google.firebase.firestore.CollectionReference, callback: (snapshot: QuerySnapshot) => void): () => void => {
+  const listener = colRef.addSnapshotListener(new com.google.firebase.firestore.EventListener({
+        onEvent: ((snapshot: com.google.firebase.firestore.QuerySnapshot, exception) => {
+          if (exception !== null) {
+            return;
+          }
+
+          const docSnapshots: Array<firestore.DocumentSnapshot> = [];
+          for (let i = 0; i < snapshot.size(); i++) {
+            const documentSnapshot: com.google.firebase.firestore.DocumentSnapshot = snapshot.getDocuments().get(i);
+            docSnapshots.push(new DocumentSnapshot(documentSnapshot.getId(), true, () => firebase.toJsObject(documentSnapshot.getData())));
+          }
+          const snap = new QuerySnapshot();
+          snap.docSnapshots = docSnapshots;
+          callback(snap);
+        })
+      })
+  );
+
+  return () => listener.remove();
+};
+
 firebase.firestore.doc = (collectionPath: string, documentPath?: string): firestore.DocumentReference => {
   try {
 
@@ -2275,7 +2309,7 @@ firebase.firestore.doc = (collectionPath: string, documentPath?: string): firest
       get: () => firebase.firestore.getDocument(collectionPath, docRef.getId()),
       update: (data: any) => firebase.firestore.update(collectionPath, docRef.getId(), data),
       delete: () => firebase.firestore.delete(collectionPath, docRef.getId()),
-      onSnapshot: (callback: (doc: DocumentSnapshot) => void) => firebase.firestore.onSnapshot(docRef, callback)
+      onSnapshot: (callback: (doc: DocumentSnapshot) => void) => firebase.firestore.onDocumentSnapshot(docRef, callback)
     };
 
   } catch (ex) {
@@ -2304,7 +2338,7 @@ firebase.firestore.add = (collectionPath: string, document: any): Promise<firest
             get: () => firebase.firestore.getDocument(collectionPath, docRef.getId()),
             update: (data: any) => firebase.firestore.update(collectionPath, docRef.getId(), data),
             delete: () => firebase.firestore.delete(collectionPath, docRef.getId()),
-            onSnapshot: (callback: (doc: DocumentSnapshot) => void) => firebase.firestore.onSnapshot(docRef, callback)
+            onSnapshot: (callback: (doc: DocumentSnapshot) => void) => firebase.firestore.onDocumentSnapshot(docRef, callback)
           });
         }
       });
@@ -2548,7 +2582,8 @@ firebase.firestore._getQuery = (collectionPath: string, query: com.google.fireba
     }),
     where: (fp: string, os: firestore.WhereFilterOp, v: any) => firebase.firestore.where(collectionPath, fp, os, v, query),
     orderBy: (fp: string, directionStr: firestore.OrderByDirection): firestore.Query => firebase.firestore.orderBy(collectionPath, fp, directionStr, query),
-    limit: (limit: number): firestore.Query => firebase.firestore.limit(collectionPath, limit, query)
+    limit: (limit: number): firestore.Query => firebase.firestore.limit(collectionPath, limit, query),
+    onSnapshot: (callback: (snapshot: QuerySnapshot) => void) => firebase.firestore.onCollectionSnapshot(query, callback)
   };
 };
 
diff --git a/src/firebase.d.ts b/src/firebase.d.ts
@@ -818,6 +818,8 @@ export namespace firestore {
     orderBy(fieldPath: string, directionStr: firestore.OrderByDirection): Query;
 
     limit(limit: number): Query;
+
+    onSnapshot(callback: (snapshot: QuerySnapshot) => void): () => void;
   }
 
   export interface CollectionReference extends Query {
diff --git a/src/firebase.ios.ts b/src/firebase.ios.ts
diff --git a/src/package.json b/src/package.json

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`}`
`10`	`10`	`},`
`11`	`11`	`"dependencies": {`
`12`		`- "nativescript-plugin-firebase": "5.1.1",`
	`12`	`+ "nativescript-plugin-firebase": "5.1.2",`
`13`	`13`	`"nativescript-theme-core": "^1.0.4",`
`14`	`14`	`"nativescript-unit-test-runner": "^0.3.4",`
`15`	`15`	`"tns-core-modules": "~3.4.0"`
Original file line number	Diff line number	Diff line change
`@@ -818,6 +818,8 @@ export namespace firestore {`
`818`	`818`	`orderBy(fieldPath: string, directionStr: firestore.OrderByDirection): Query;`
`819`	`819`
`820`	`820`	`limit(limit: number): Query;`
	`821`	`+`
	`822`	`+ onSnapshot(callback: (snapshot: QuerySnapshot) => void): () => void;`
`821`	`823`	`}`
`822`	`824`
`823`	`825`	`export interface CollectionReference extends Query {`