Merge branch 'bunch_dev' into bunch_dev_6.4.1

BunchLive · Apr 15, 2020 · 6e9ee60 · 6e9ee60
2 parents 7a68665 + 3c09da5
commit 6e9ee60
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 9 deletions.
diff --git a/packages/auth/lib/PhoneAuthListener.js b/packages/auth/lib/PhoneAuthListener.js
@@ -28,7 +28,7 @@ export default class PhoneAuthListener {
     this._promise = null;
     this._jsStack = new Error().stack;
 
-    this._timeout = timeout || 20;
+    this._timeout = typeof timeout === 'number' && 0 <= timeout ? timeout : 20;
     this._phoneAuthRequestId = REQUEST_ID++;
     this._forceResending = forceResend || false;
 

diff --git a/packages/database/ios/RNFBDatabase/RNFBDatabaseCommon.m b/packages/database/ios/RNFBDatabase/RNFBDatabaseCommon.m
@@ -65,8 +65,10 @@ + (void)setDatabaseConfig:(FIRDatabase *)firDatabase
   @try {
     // Persistence enabled
     BOOL *persistenceEnabled = (BOOL *) [preferences getBooleanValue:DATABASE_PERSISTENCE_ENABLED defaultValue:false];
-    [firDatabase setPersistenceEnabled:(BOOL) persistenceEnabled];
-
+    if (firDatabase.persistenceEnabled != (BOOL)persistenceEnabled){
+      [firDatabase setPersistenceEnabled:(BOOL) persistenceEnabled];
+    }
+
     // Logging enabled
     BOOL *loggingEnabled = (BOOL *) [preferences getBooleanValue:DATABASE_LOGGING_ENABLED defaultValue:false];
     [FIRDatabase setLoggingEnabled:(BOOL) loggingEnabled];

diff --git a/packages/database/ios/RNFBDatabase/RNFBDatabaseReferenceModule.m b/packages/database/ios/RNFBDatabase/RNFBDatabaseReferenceModule.m
@@ -44,7 +44,13 @@ - (dispatch_queue_t)methodQueue {
     : (RCTPromiseRejectBlock)reject
 ) {
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
-  FIRDatabaseReference *firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  FIRDatabaseReference *firDatabaseReference;
+  @try {
+    firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  } @catch (NSException *exception) {
+    resolve([NSNull null]);
+    return;
+  }
 
   [firDatabaseReference setValue:[props valueForKey:@"value"] withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
     if (error != nil) {
@@ -64,7 +70,13 @@ - (dispatch_queue_t)methodQueue {
     : (RCTPromiseRejectBlock)reject
 ) {
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
-  FIRDatabaseReference *firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  FIRDatabaseReference *firDatabaseReference;
+  @try {
+    firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  } @catch (NSException *exception) {
+    resolve([NSNull null]);
+    return;
+  }
 
   [firDatabaseReference updateChildValues:[props valueForKey:@"values"] withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
     if (error != nil) {
@@ -84,7 +96,13 @@ - (dispatch_queue_t)methodQueue {
     : (RCTPromiseRejectBlock)reject
 ) {
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
-  FIRDatabaseReference *firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  FIRDatabaseReference *firDatabaseReference;
+  @try {
+    firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  } @catch (NSException *exception) {
+    resolve([NSNull null]);
+    return;
+  }
 
   [firDatabaseReference setValue:[props valueForKey:@"value"] andPriority:[props valueForKey:@"priority"] withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
     if (error != nil) {
@@ -103,8 +121,13 @@ - (dispatch_queue_t)methodQueue {
     : (RCTPromiseRejectBlock)reject
 ) {
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
-  FIRDatabaseReference *firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
-
+  FIRDatabaseReference *firDatabaseReference;
+  @try {
+    firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  } @catch (NSException *exception) {
+    resolve([NSNull null]);
+    return;
+  }
   [firDatabaseReference removeValueWithCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
     if (error != nil) {
       [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
@@ -123,7 +146,13 @@ - (dispatch_queue_t)methodQueue {
     : (RCTPromiseRejectBlock)reject
 ) {
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
-  FIRDatabaseReference *firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  FIRDatabaseReference *firDatabaseReference;
+  @try {
+    firDatabaseReference = [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+  } @catch (NSException *exception) {
+    resolve([NSNull null]);
+    return;
+  }
 
   [firDatabaseReference setPriority:[props valueForKey:@"priority"] withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
     if (error != nil) {

diff --git a/tarball/react-native-firebase-auth-v6.3.4-bunch.1.tgz b/tarball/react-native-firebase-auth-v6.3.4-bunch.1.tgz
diff --git a/tarball/react-native-firebase-database-v6.3.4-bunch.1.tgz b/tarball/react-native-firebase-database-v6.3.4-bunch.1.tgz
diff --git a/tarball/react-native-firebase-database-v6.3.4-bunch.2.tgz b/tarball/react-native-firebase-database-v6.3.4-bunch.2.tgz
diff --git a/tarball/react-native-firebase-database-v6.3.4-bunch.3.tgz b/tarball/react-native-firebase-database-v6.3.4-bunch.3.tgz
diff --git a/tarball/react-native-firebase-database-v6.4.0-bunch.1.tgz b/tarball/react-native-firebase-database-v6.4.0-bunch.1.tgz