Merge pull request #30 from dayitv89/androidUpgrade33

Android Firebase SDK Upgrade 33

Author: dishantwalia

android/build.gradle

@@ -7,32 +7,32 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.5.4'
     }
 }
 
 apply plugin: 'com.android.library'
 
-def DEFAULT_COMPILE_SDK_VERSION             = 27
-def DEFAULT_BUILD_TOOLS_VERSION             = "27.0.3"
-def DEFAULT_TARGET_SDK_VERSION              = 27
-def DEFAULT_FIREBASE_BOM_VERSION            = "28.4.1"
-def DEFAULT_SUPPORT_LIB_VERSION             = "27.0.0"
+def DEFAULT_TARGET_SDK_VERSION              = 33
+def DEFAULT_FIREBASE_BOM_VERSION            = "32.7.2"
+def DEFAULT_SUPPORT_LIB_VERSION             = "34.0.0"
 
 
 
 android {
-    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 23
         targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
         versionCode 1
         versionName "1.0"
     }
     lintOptions {
         abortOnError false
     }
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+        namespace "com.gds.quickfirebase"
+    }
 }
 
 repositories {

android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gds.quickfirebase">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-</manifest>
+</manifest>

android/src/main/java/com/gds/quickfirebase/RNQuickFirebase.java

@@ -1,8 +1,7 @@
 package com.gds.quickfirebase;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.os.Bundle;
 import android.text.TextUtils;
 import com.facebook.react.bridge.Arguments;
@@ -20,6 +19,7 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.PhoneAuthCredential;
+import com.google.firebase.auth.PhoneAuthOptions;
 import com.google.firebase.auth.PhoneAuthProvider;
 
 import java.util.concurrent.TimeUnit;
@@ -52,28 +52,27 @@ public String getName() {
 
     @ReactMethod
     public void sendOTP(String phone, final Promise promise) {
-        PhoneAuthProvider.getInstance().verifyPhoneNumber(
-                phone,        // Phone number to verify
-                60,              // Timeout duration
-                TimeUnit.SECONDS,   // Unit of timeout
-                reactContext.getCurrentActivity(),       // Activity (for callback binding)
-                new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
+        PhoneAuthOptions phoneAuthOptions =  new PhoneAuthOptions.Builder(mAuth).setPhoneNumber(phone)
+                .setTimeout(60L, TimeUnit.SECONDS).setActivity(reactContext.getCurrentActivity())
+                .setCallbacks(new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
                     @Override
-                    public void onVerificationCompleted(PhoneAuthCredential credential) {
+                    public void onVerificationCompleted(@NonNull PhoneAuthCredential phoneAuthCredential) {
+                        
                     }
 
                     @Override
-                    public void onVerificationFailed(FirebaseException e) {
+                    public void onVerificationFailed(@NonNull FirebaseException e) {
                         promise.reject(e);
                     }
 
                     @Override
-                    public void onCodeSent(String verificationId, PhoneAuthProvider.ForceResendingToken token) {
+                    public void onCodeSent(@NonNull String verificationId, @NonNull PhoneAuthProvider.ForceResendingToken forceResendingToken) {
                         promise.resolve(verificationId);
                         mVerificationId = verificationId;
-                        mResendToken = token;
+                        mResendToken = forceResendingToken;
                     }
-                });
+                }).build();
+        PhoneAuthProvider.verifyPhoneNumber(phoneAuthOptions);
     }
 
     @ReactMethod