From 1f814d4cab8327bd935bbc1dd94159df7d1c055f Mon Sep 17 00:00:00 2001 From: Chris Bianca Date: Fri, 18 May 2018 07:58:32 +0100 Subject: [PATCH] [android][firestore] Ensure settings are preserved if `settings` is called multiple times --- .../invertase/firebase/firestore/RNFirebaseFirestore.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java b/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java index ccddad12..053d9ee4 100644 --- a/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java +++ b/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java @@ -205,12 +205,18 @@ public class RNFirebaseFirestore extends ReactContextBaseJavaModule { FirebaseFirestoreSettings.Builder firestoreSettings = new FirebaseFirestoreSettings.Builder(); if (settings.hasKey("host")) { firestoreSettings.setHost(settings.getString("host")); + } else { + firestoreSettings.setHost(firestore.getFirestoreSettings().getHost()); } if (settings.hasKey("persistence")) { firestoreSettings.setPersistenceEnabled(settings.getBoolean("persistence")); + } else { + firestoreSettings.setPersistenceEnabled(firestore.getFirestoreSettings().isPersistenceEnabled()); } if (settings.hasKey("ssl")) { firestoreSettings.setSslEnabled(settings.getBoolean("ssl")); + } else { + firestoreSettings.setSslEnabled(firestore.getFirestoreSettings().isSslEnabled()); } if (settings.hasKey("timestampsInSnapshots")) { // TODO: Not supported on Android yet