Crash after updating pods on iOS #1076

Author: EddyVerbruggen

src/firebase.android.ts

@@ -282,7 +282,9 @@ firebase.init = arg => {
   return new Promise((resolve, reject) => {
     if (firebase.initialized) {
       reject("Firebase already initialized");
+      return;
     }
+
     firebase.initialized = true;
 
     const runInit = () => {
@@ -1947,6 +1949,11 @@ firebase.firestore.collection = (collectionPath: string): firestore.CollectionRe
       return null;
     }
 
+    if (!firebase.initialized) {
+      console.log("Please run firebase.init() before firebase.firestore.collection()");
+      return null;
+    }
+
     const db = com.google.firebase.firestore.FirebaseFirestore.getInstance();
     const collectionRef: com.google.firebase.firestore.CollectionReference = db.collection(collectionPath);
 
@@ -2022,6 +2029,11 @@ firebase.firestore.doc = (collectionPath: string, documentPath?: string): firest
       return null;
     }
 
+    if (!firebase.initialized) {
+      console.log("Please run firebase.init() before firebase.firestore.doc()");
+      return null;
+    }
+
     const db = com.google.firebase.firestore.FirebaseFirestore.getInstance();
     const colRef: com.google.firebase.firestore.CollectionReference = db.collection(collectionPath);
     const docRef: com.google.firebase.firestore.DocumentReference = documentPath ? colRef.document(documentPath) : colRef.document();

src/firebase.ios.ts

@@ -16,6 +16,7 @@ firebase._gIDAuthentication = null;
 firebase._cachedInvitation = null;
 firebase._cachedDynamicLink = null;
 firebase._configured = false;
+firebase._beforeInitQueue = [];
 
 const useExternalPushProvider = NSBundle.mainBundle.infoDictionary.objectForKey("UseExternalPushProvider") === true;
 
@@ -332,7 +333,9 @@ firebase.init = arg => {
   return new Promise((resolve, reject) => {
     if (firebase.initialized) {
       reject("Firebase already initialized");
+      return;
     }
+
     firebase.initialized = true;
 
     try {
@@ -1621,13 +1624,19 @@ firebase.firestore.runTransaction = (updateFunction: (transaction: firestore.Tra
   });
 };
 
+
 firebase.firestore.collection = (collectionPath: string): firestore.CollectionReference => {
   try {
     if (typeof(FIRFirestore) === "undefined") {
       console.log("Make sure 'Firebase/Firestore' is in the plugin's Podfile");
       return null;
     }
 
+    if (!firebase.initialized) {
+      console.log("Please run firebase.init() before firebase.firestore.collection()");
+      return null;
+    }
+
     const fIRCollectionReference = FIRFirestore.firestore().collectionWithPath(collectionPath);
 
     return {
@@ -1713,6 +1722,11 @@ firebase.firestore.doc = (collectionPath: string, documentPath?: string): firest
       return null;
     }
 
+    if (!firebase.initialized) {
+      console.log("Please run firebase.init() before firebase.firestore.doc()");
+      return null;
+    }
+
     const fIRCollectionReference = FIRFirestore.firestore().collectionWithPath(collectionPath);
     const fIRDocumentReference = documentPath ? fIRCollectionReference.documentWithPath(documentPath) : fIRCollectionReference.documentWithAutoID();
     return firebase.firestore._getDocumentReference(fIRDocumentReference, collectionPath, documentPath);