From 621df87145ca3a33744eb9ec55fdcd3eb0cb8691 Mon Sep 17 00:00:00 2001 From: Salakar Date: Wed, 8 Nov 2017 15:59:55 +0000 Subject: [PATCH] [android][database] added `enableLogging(boolean)` method --- .../firebase/database/RNFirebaseDatabase.java | 14 +++++++++++--- .../database/RNFirebaseDatabaseReference.java | 4 +++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java index 8c381214..c2a35ee9 100644 --- a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java +++ b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java @@ -90,7 +90,7 @@ public class RNFirebaseDatabase extends ReactContextBaseJavaModule { List firebaseAppList = FirebaseApp.getApps(getReactApplicationContext()); for (FirebaseApp app : firebaseAppList) { if (enableLogging) { - FirebaseDatabase.getInstance(app).setLogLevel(Logger.Level.INFO); + FirebaseDatabase.getInstance(app).setLogLevel(Logger.Level.DEBUG); } else { FirebaseDatabase.getInstance(app).setLogLevel(Logger.Level.WARN); } @@ -484,9 +484,17 @@ public class RNFirebaseDatabase extends ReactContextBaseJavaModule { * @param appName * @return */ - static FirebaseDatabase getDatabaseForApp(String appName) { + private FirebaseDatabase getDatabaseForApp(String appName) { FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); - return FirebaseDatabase.getInstance(firebaseApp); + FirebaseDatabase firebaseDatabase = FirebaseDatabase.getInstance(firebaseApp); + + if (enableLogging) { + firebaseDatabase.setLogLevel(Logger.Level.DEBUG); + } else { + firebaseDatabase.setLogLevel(Logger.Level.WARN); + } + + return firebaseDatabase; } /** diff --git a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java index 60a6cbe5..9cf197de 100644 --- a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java +++ b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java @@ -14,6 +14,7 @@ import com.facebook.react.bridge.WritableMap; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; +import com.google.firebase.FirebaseApp; import com.google.firebase.database.Query; import com.google.firebase.database.DataSnapshot; import com.google.firebase.database.DatabaseError; @@ -345,7 +346,8 @@ class RNFirebaseDatabaseReference { * @return */ private void buildDatabaseQueryAtPathAndModifiers(String path, ReadableArray modifiers) { - FirebaseDatabase firebaseDatabase = RNFirebaseDatabase.getDatabaseForApp(appName); + FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); + FirebaseDatabase firebaseDatabase = FirebaseDatabase.getInstance(firebaseApp); query = firebaseDatabase.getReference(path); List modifiersList = Utils.recursivelyDeconstructReadableArray(modifiers);