From 0761c987305288cb74cd494f68330efea117730c Mon Sep 17 00:00:00 2001 From: Avihu Harush Date: Fri, 12 Jun 2020 15:59:25 +0300 Subject: [PATCH 1/2] Update CapacitorFirebaseAuth.java Compatible with Capacitor 2.2.0 --- .../capacitor/firebase/auth/CapacitorFirebaseAuth.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/CapacitorFirebaseAuth.java b/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/CapacitorFirebaseAuth.java index 39d291075..6aca54090 100644 --- a/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/CapacitorFirebaseAuth.java +++ b/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/CapacitorFirebaseAuth.java @@ -51,9 +51,9 @@ public void load() { getConfigValue("nada"); - String[] providers = Config.getArray(CONFIG_KEY_PREFIX+"providers", new String[0]); - this.nativeAuth = Config.getBoolean(CONFIG_KEY_PREFIX+"nativeAuth", false); - String languageCode = Config.getString(CONFIG_KEY_PREFIX+"languageCode", "en"); + String[] providers = getBridge().getConfig().getArray(CONFIG_KEY_PREFIX+"providers", new String[0]); + this.nativeAuth = getBridge().getConfig().getBoolean(CONFIG_KEY_PREFIX+"nativeAuth", false); + String languageCode = getBridge().getConfig().getString(CONFIG_KEY_PREFIX+"languageCode", "en"); // FirebaseApp is not initialized in this process - Error #1 Log.d(PLUGIN_TAG, "Verifying if the default FirebaseApp was initialized."); From 1429162efe43f3d502e7d40783959f15153808ec Mon Sep 17 00:00:00 2001 From: Avihu Harush Date: Fri, 12 Jun 2020 16:00:40 +0300 Subject: [PATCH 2/2] Update GoogleProviderHandler.java Compatible with Capacitor 2.2.0 --- .../capacitor/firebase/auth/handlers/GoogleProviderHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/handlers/GoogleProviderHandler.java b/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/handlers/GoogleProviderHandler.java index e585f1029..2ff391b23 100644 --- a/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/handlers/GoogleProviderHandler.java +++ b/android/capacitor-firebase-auth/src/main/java/com/baumblatt/capacitor/firebase/auth/handlers/GoogleProviderHandler.java @@ -39,7 +39,7 @@ public class GoogleProviderHandler implements ProviderHandler, GoogleApiClient.O public void init(CapacitorFirebaseAuth plugin) { this.plugin = plugin; - String[] permissions = Config.getArray(CONFIG_KEY_PREFIX + "permissions.google", new String[0]); + String[] permissions = plugin.getBridge().getConfig().getArray(CONFIG_KEY_PREFIX + "permissions.google", new String[0]); GoogleApiAvailability googleAPI = GoogleApiAvailability.getInstance(); int result = googleAPI.isGooglePlayServicesAvailable(this.plugin.getContext());