Merge remote-tracking branch 'origin/master' into fix-auth-user

Author: BlooJeans

Diff for: ios/Firestack/Firestack.m

@@ -239,7 +239,9 @@ - (FIRApp *) firebaseApp
 
             // if (!self.configured) {
 
-            [FIRApp configureWithOptions:finalOptions];
+            if ([FIRApp defaultApp] == NULL) {
+                [FIRApp configureWithOptions:finalOptions];
+            }            
             [Firestack initializeFirestack:self];
             callback(@[[NSNull null], props]);
         }

Diff for: ios/Firestack/FirestackAuth.h

@@ -15,6 +15,7 @@
 
 @interface FirestackAuth : RCTEventEmitter <RCTBridgeModule> {
     FIRAuthStateDidChangeListenerHandle authListenerHandle;
+    Boolean listening;
 }
 
 @end

Diff for: ios/Firestack/FirestackAuth.m

@@ -130,6 +130,7 @@ @implementation FirestackAuth
 
 RCT_EXPORT_METHOD(listenForAuth)
 {
+    self->listening = true;
     self->authListenerHandle =
     [[FIRAuth auth] addAuthStateDidChangeListener:^(FIRAuth *_Nonnull auth,
                                                     FIRUser *_Nullable user) {
@@ -174,15 +175,11 @@ @implementation FirestackAuth
 {
     if (self->authListenerHandle != nil) {
         [[FIRAuth auth] removeAuthStateDidChangeListener:self->authListenerHandle];
+        self->listening = false;
         callback(@[[NSNull null]]);
     }
 }
 
-// Helper
-- (Boolean) listeningForAuth {
-  return (self->authListenerHandle != nil);
-}
-
 RCT_EXPORT_METHOD(getCurrentUser:(RCTResponseSenderBlock)callback)
 {
     FIRUser *user = [FIRAuth auth].currentUser;
@@ -496,7 +493,7 @@ - (void) sendJSEvent:(NSString *)title
                props:(NSDictionary *)props
 {
     @try {
-      if ([self listeningForAuth]) {
+      if (self->listening) {
         [self sendEventWithName:title
                            body:props];
       }

Diff for: ios/Firestack/FirestackDatabase.m

@@ -240,7 +240,11 @@ @implementation FirestackDatabase
 RCT_EXPORT_METHOD(enablePersistence:(BOOL) enable
   callback:(RCTResponseSenderBlock) callback)
 {
-  [FIRDatabase database].persistenceEnabled = enable;
+    
+  BOOL isEnabled = [FIRDatabase database].persistenceEnabled;
+  if ( isEnabled != enable) {
+    [FIRDatabase database].persistenceEnabled = enable;
+  }
   callback(@[[NSNull null], @{
     @"result": @"success"
   }]);

Diff for: lib/modules/database.js

@@ -367,11 +367,11 @@ export class Database extends Base {
   }
 
   setPersistence(enable=true) {
-    this.persistenceEnabled = enable;
     let promise;
     if (this.persistenceEnabled !== enable) {
       this.log.debug(`${enable ? 'Enabling' : 'Disabling'} persistence`);
       promise = this.whenReady(promisify('enablePersistence', FirestackDatabase)(enable));
+      this.persistenceEnabled = enable;
     } else {
       promise = this.whenReady(Promise.resolve({status: "Already enabled"}))
     }