From 602681d1c6f0a709e72b0c428f472854a411ebdc Mon Sep 17 00:00:00 2001 From: kenyd Date: Wed, 15 Jan 2020 17:19:11 +0700 Subject: [PATCH 1/4] update to latest dependencies --- .../Plugin.FirebaseAuth.Android.csproj | 482 ++++++++++-------- Plugin.FirebaseAuth.Android/packages.config | 60 +-- .../Plugin.FirebaseAuth.iOS.csproj | 29 +- Plugin.FirebaseAuth.iOS/packages.config | 6 +- 4 files changed, 313 insertions(+), 264 deletions(-) diff --git a/Plugin.FirebaseAuth.Android/Plugin.FirebaseAuth.Android.csproj b/Plugin.FirebaseAuth.Android/Plugin.FirebaseAuth.Android.csproj index 43538a0..a242fd1 100644 --- a/Plugin.FirebaseAuth.Android/Plugin.FirebaseAuth.Android.csproj +++ b/Plugin.FirebaseAuth.Android/Plugin.FirebaseAuth.Android.csproj @@ -1,227 +1,265 @@  - - + + + + Debug + AnyCPU + {63819CB9-488A-4439-A16F-211402623C91} + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Plugin.FirebaseAuth + Plugin.FirebaseAuth + v9.0 + Resources + Assets + false + + + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + None + + + true + pdbonly + true + bin\Release + prompt + 4 + bin\Release\Plugin.FirebaseAuth.xml + true + false + + + + + + + + + ..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll + + + ..\packages\Xamarin.Android.Arch.Core.Runtime.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll + + + ..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll + + + ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll + + + ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.Core.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll + + + ..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + ..\packages\Xamarin.Android.Arch.Lifecycle.ViewModel.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll + + + ..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll + + + ..\packages\Xamarin.Android.Support.AsyncLayoutInflater.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll + + + ..\packages\Xamarin.Android.Support.Collections.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Collections.dll + + + ..\packages\Xamarin.Android.Support.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Compat.dll + + + ..\packages\Xamarin.Android.Support.CoordinaterLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll + + + ..\packages\Xamarin.Android.Support.Core.UI.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll + + + ..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll + + + ..\packages\Xamarin.Android.Support.CursorAdapter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll + + + ..\packages\Xamarin.Android.Support.CustomView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll + + + ..\packages\Xamarin.Android.Support.DocumentFile.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll + + + ..\packages\Xamarin.Android.Support.DrawerLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll + + + ..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll + + + ..\packages\Xamarin.Android.Support.Interpolator.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll + + + ..\packages\Xamarin.Android.Support.Loader.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Loader.dll + + + ..\packages\Xamarin.Android.Support.LocalBroadcastManager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll + + + ..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll + + + ..\packages\Xamarin.Android.Support.Print.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Print.dll + + + ..\packages\Xamarin.Android.Support.SlidingPaneLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll + + + ..\packages\Xamarin.Android.Support.SwipeRefreshLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll + + + ..\packages\Xamarin.Android.Support.v4.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v4.dll + + + ..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll + + + ..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll + + + ..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll + + + ..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll + + + ..\packages\Xamarin.Firebase.Common.71.1610.0\lib\monoandroid90\Xamarin.Firebase.Common.dll + + + ..\packages\Xamarin.GooglePlayServices.Base.71.1610.0\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll + + + ..\packages\Xamarin.Firebase.Auth.Interop.71.1601.0\lib\monoandroid90\Xamarin.Firebase.Auth.Interop.dll + + + ..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0\lib\monoandroid90\Xamarin.GooglePlayServices.Flags.dll + + + ..\packages\Xamarin.Firebase.Auth.71.1605.0\lib\monoandroid90\Xamarin.Firebase.Auth.dll + + + ..\packages\Plugin.CurrentActivity.2.1.0.4\lib\monoandroid44\Plugin.CurrentActivity.dll + + + ..\packages\Xamarin.Google.AutoValue.Annotations.1.6.5\lib\monoandroid80\Xamarin.Google.AutoValue.Annotations.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Debug - AnyCPU - {63819CB9-488A-4439-A16F-211402623C91} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Plugin.FirebaseAuth - Plugin.FirebaseAuth - v9.0 - Resources - Assets - false + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - None - - - true - pdbonly - true - bin\Release - prompt - 4 - bin\Release\Plugin.FirebaseAuth.xml - true - false - - - - - - - - - ..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll - - - ..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll - - - ..\packages\Xamarin.Android.Support.Compat.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Compat.dll - - - ..\packages\Xamarin.Android.Support.Core.UI.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll - - - ..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll - - - ..\packages\Xamarin.Android.Support.Fragment.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll - - - ..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll - - - ..\packages\Xamarin.Android.Support.v4.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.GooglePlayServices.Basement.71.1620.0\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll - - - ..\packages\Xamarin.GooglePlayServices.Tasks.71.1601.0\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll - - - ..\packages\Xamarin.Firebase.Common.71.1610.0\lib\monoandroid90\Xamarin.Firebase.Common.dll - - - ..\packages\Xamarin.GooglePlayServices.Base.71.1610.0\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll - - - ..\packages\Xamarin.Firebase.Auth.Interop.71.1601.0\lib\monoandroid90\Xamarin.Firebase.Auth.Interop.dll - - - ..\packages\Xamarin.GooglePlayServices.Flags.71.1601.0\lib\monoandroid90\Xamarin.GooglePlayServices.Flags.dll - - - ..\packages\Xamarin.Firebase.Auth.71.1605.0\lib\monoandroid90\Xamarin.Firebase.Auth.dll - - - ..\packages\Xamarin.Android.Arch.Core.Runtime.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.Core.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.ViewModel.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll - - - ..\packages\Xamarin.Android.Support.Collections.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Collections.dll - - - ..\packages\Xamarin.Android.Support.CursorAdapter.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll - - - ..\packages\Xamarin.Android.Support.DocumentFile.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll - - - ..\packages\Xamarin.Android.Support.Interpolator.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll - - - ..\packages\Xamarin.Android.Support.LocalBroadcastManager.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll - - - ..\packages\Xamarin.Android.Support.Print.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Print.dll - - - ..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll - - - ..\packages\Xamarin.Android.Support.AsyncLayoutInflater.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll - - - ..\packages\Xamarin.Android.Support.CustomView.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll - - - ..\packages\Xamarin.Android.Support.CoordinaterLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll - - - ..\packages\Xamarin.Android.Support.DrawerLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll - - - ..\packages\Xamarin.Android.Support.Loader.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Loader.dll - - - ..\packages\Xamarin.Android.Support.SlidingPaneLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll - - - ..\packages\Xamarin.Android.Support.SwipeRefreshLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll - - - ..\packages\Xamarin.Android.Support.ViewPager.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll - - - ..\packages\Plugin.CurrentActivity.2.1.0.4\lib\monoandroid44\Plugin.CurrentActivity.dll - - - ..\packages\Xamarin.Google.AutoValue.Annotations.1.6.5\lib\monoandroid80\Xamarin.Google.AutoValue.Annotations.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Plugin.FirebaseAuth.Android/packages.config b/Plugin.FirebaseAuth.Android/packages.config index 9e1e325..32bec4b 100644 --- a/Plugin.FirebaseAuth.Android/packages.config +++ b/Plugin.FirebaseAuth.Android/packages.config @@ -2,36 +2,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plugin.FirebaseAuth.iOS/Plugin.FirebaseAuth.iOS.csproj b/Plugin.FirebaseAuth.iOS/Plugin.FirebaseAuth.iOS.csproj index 35d5998..40dfd4e 100644 --- a/Plugin.FirebaseAuth.iOS/Plugin.FirebaseAuth.iOS.csproj +++ b/Plugin.FirebaseAuth.iOS/Plugin.FirebaseAuth.iOS.csproj @@ -1,6 +1,6 @@ - + - + Debug @@ -11,6 +11,8 @@ Plugin.FirebaseAuth Plugin.FirebaseAuth Resources + + true @@ -40,16 +42,16 @@ NSUrlSessionHandler + + ..\packages\Xamarin.Firebase.iOS.Auth.6.2.1.1\lib\xamarinios10\Firebase.Auth.dll + + + ..\packages\Xamarin.Firebase.iOS.Core.6.1.0\lib\xamarinios10\Firebase.Core.dll + - - ..\packages\Xamarin.Firebase.iOS.Core.5.1.3\lib\Xamarin.iOS10\Firebase.Core.dll - - - ..\packages\Xamarin.Firebase.iOS.Auth.5.0.4.1\lib\Xamarin.iOS10\Firebase.Auth.dll - @@ -80,5 +82,14 @@ - + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + \ No newline at end of file diff --git a/Plugin.FirebaseAuth.iOS/packages.config b/Plugin.FirebaseAuth.iOS/packages.config index 965ce6a..842189d 100644 --- a/Plugin.FirebaseAuth.iOS/packages.config +++ b/Plugin.FirebaseAuth.iOS/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file From 05fb0fe30cd0efbec9ab37217ed7ca2a3ec1b165 Mon Sep 17 00:00:00 2001 From: kenyd Date: Wed, 15 Jan 2020 17:19:46 +0700 Subject: [PATCH 2/4] fix methods obsoleted --- Plugin.FirebaseAuth.iOS/PhoneAuthProviderWrapper.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugin.FirebaseAuth.iOS/PhoneAuthProviderWrapper.cs b/Plugin.FirebaseAuth.iOS/PhoneAuthProviderWrapper.cs index cd50ccb..ebcfeca 100644 --- a/Plugin.FirebaseAuth.iOS/PhoneAuthProviderWrapper.cs +++ b/Plugin.FirebaseAuth.iOS/PhoneAuthProviderWrapper.cs @@ -14,7 +14,7 @@ public class PhoneAuthProviderWrapper : IPhoneAuthProvider public IPhoneAuthCredential GetCredential(IAuth auth, string verificationId, string verificationCode) { var wrapper = (AuthWrapper)auth; - var credential = PhoneAuthProvider.From((Auth)wrapper).GetCredential(verificationId, verificationCode); + var credential = PhoneAuthProvider.Create((Auth)wrapper).GetCredential(verificationId, verificationCode); return new PhoneAuthCredentialWrapper(credential); } @@ -31,7 +31,7 @@ public async Task VerifyPhoneNumberAsync(IAuth au var firebaseAuth = (Auth)wrapper; firebaseAuth.Settings.AppVerificationDisabledForTesting = false; - var verificationId = await PhoneAuthProvider.From(firebaseAuth) + var verificationId = await PhoneAuthProvider.Create(firebaseAuth) .VerifyPhoneNumberAsync(phoneNumber, FirebaseAuth.VerifyingPhoneNumberAuthUIDelegate) .ConfigureAwait(false); @@ -56,7 +56,7 @@ public async Task VerifyPhoneNumberForTestingAsyn var firebaseAuth = (Auth)wrapper; firebaseAuth.Settings.AppVerificationDisabledForTesting = true; - var verificationId = await PhoneAuthProvider.From(firebaseAuth) + var verificationId = await PhoneAuthProvider.Create(firebaseAuth) .VerifyPhoneNumberAsync(phoneNumber, FirebaseAuth.VerifyingPhoneNumberAuthUIDelegate) .ConfigureAwait(false); From 2e895186157dcb44a3bff900d0f995c5975fe92b Mon Sep 17 00:00:00 2001 From: kenyd Date: Wed, 15 Jan 2020 17:27:47 +0700 Subject: [PATCH 3/4] fix method obsoleted on AuthWrapper and UserWrapper --- Plugin.FirebaseAuth.iOS/AuthWrapper.cs | 4 ++-- Plugin.FirebaseAuth.iOS/UserWrapper.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugin.FirebaseAuth.iOS/AuthWrapper.cs b/Plugin.FirebaseAuth.iOS/AuthWrapper.cs index 71338bf..8235621 100644 --- a/Plugin.FirebaseAuth.iOS/AuthWrapper.cs +++ b/Plugin.FirebaseAuth.iOS/AuthWrapper.cs @@ -65,7 +65,7 @@ public async Task SignInWithCredentialAsync(IAuthCredential credent try { var wrapper = (AuthCredentialWrapper)credential; - var result = await _auth.SignInAndRetrieveDataWithCredentialAsync((AuthCredential)wrapper).ConfigureAwait(false); + var result = await _auth.SignInWithCredentialAsync((AuthCredential)wrapper).ConfigureAwait(false); return new AuthResultWrapper(result); } catch (NSErrorException e) @@ -117,7 +117,7 @@ public async Task FetchProvidersForEmailAsync(string email) { try { - return await _auth.FetchProvidersAsync(email).ConfigureAwait(false); + return await _auth.FetchSignInMethodsAsync(email).ConfigureAwait(false); } catch (NSErrorException e) { diff --git a/Plugin.FirebaseAuth.iOS/UserWrapper.cs b/Plugin.FirebaseAuth.iOS/UserWrapper.cs index a31a1a1..779d2bc 100644 --- a/Plugin.FirebaseAuth.iOS/UserWrapper.cs +++ b/Plugin.FirebaseAuth.iOS/UserWrapper.cs @@ -70,7 +70,7 @@ public async Task LinkWithCredentialAsync(IAuthCredential credentia try { var wrapper = (AuthCredentialWrapper)credential; - var result = await _user.LinkAndRetrieveDataAsync((AuthCredential)wrapper).ConfigureAwait(false); + var result = await _user.LinkAsync((AuthCredential)wrapper).ConfigureAwait(false); return new AuthResultWrapper(result); } catch (NSErrorException e) From 24e2250643feeade7ba5ddc52fed57ebe85ce74d Mon Sep 17 00:00:00 2001 From: kenyd Date: Wed, 15 Jan 2020 17:31:26 +0700 Subject: [PATCH 4/4] [Android] Optimization --- Plugin.FirebaseAuth.Android/ActionCodeSettingsExtensions.cs | 3 +-- Plugin.FirebaseAuth.Android/AdditionalUserInfoWrapper.cs | 3 +-- Plugin.FirebaseAuth.Android/AuthCredentialWrapper.cs | 3 +-- Plugin.FirebaseAuth.Android/AuthProvider.cs | 2 +- Plugin.FirebaseAuth.Android/FirebaseAuthImplementation.cs | 6 +----- Plugin.FirebaseAuth.Android/GitHubAuthProviderWrapper.cs | 3 +-- Plugin.FirebaseAuth.Android/GoogleAuthProviderWrapper.cs | 3 +-- Plugin.FirebaseAuth.Android/OAuthProviderWrapper.cs | 3 +-- Plugin.FirebaseAuth.Android/OnCompleteHandler.cs | 5 ++--- Plugin.FirebaseAuth.Android/PhoneAuthCredentialWrapper.cs | 3 +-- Plugin.FirebaseAuth.Android/PhoneAuthProviderWrapper.cs | 4 +--- Plugin.FirebaseAuth.Android/PlayGamesAuthProviderWrapper.cs | 3 +-- Plugin.FirebaseAuth.Android/TwitterAuthProviderWrapper.cs | 3 +-- 13 files changed, 14 insertions(+), 30 deletions(-) diff --git a/Plugin.FirebaseAuth.Android/ActionCodeSettingsExtensions.cs b/Plugin.FirebaseAuth.Android/ActionCodeSettingsExtensions.cs index b2fd239..35fd5aa 100644 --- a/Plugin.FirebaseAuth.Android/ActionCodeSettingsExtensions.cs +++ b/Plugin.FirebaseAuth.Android/ActionCodeSettingsExtensions.cs @@ -1,5 +1,4 @@ -using System; -namespace Plugin.FirebaseAuth +namespace Plugin.FirebaseAuth { internal static class ActionCodeSettingsExtensions { diff --git a/Plugin.FirebaseAuth.Android/AdditionalUserInfoWrapper.cs b/Plugin.FirebaseAuth.Android/AdditionalUserInfoWrapper.cs index 33c070e..745297e 100644 --- a/Plugin.FirebaseAuth.Android/AdditionalUserInfoWrapper.cs +++ b/Plugin.FirebaseAuth.Android/AdditionalUserInfoWrapper.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Android.Runtime; using Android.Support.V4.Util; diff --git a/Plugin.FirebaseAuth.Android/AuthCredentialWrapper.cs b/Plugin.FirebaseAuth.Android/AuthCredentialWrapper.cs index 9759085..03079b7 100644 --- a/Plugin.FirebaseAuth.Android/AuthCredentialWrapper.cs +++ b/Plugin.FirebaseAuth.Android/AuthCredentialWrapper.cs @@ -1,5 +1,4 @@ -using System; -using Firebase.Auth; +using Firebase.Auth; namespace Plugin.FirebaseAuth { public class AuthCredentialWrapper : IAuthCredential diff --git a/Plugin.FirebaseAuth.Android/AuthProvider.cs b/Plugin.FirebaseAuth.Android/AuthProvider.cs index eb44895..7527d03 100644 --- a/Plugin.FirebaseAuth.Android/AuthProvider.cs +++ b/Plugin.FirebaseAuth.Android/AuthProvider.cs @@ -6,7 +6,7 @@ namespace Plugin.FirebaseAuth { internal static class AuthProvider { - private static ConcurrentDictionary> _auths = new ConcurrentDictionary>(); + private static readonly ConcurrentDictionary> _auths = new ConcurrentDictionary>(); public static AuthWrapper Auth => _auths.GetOrAdd(Firebase.Auth.FirebaseAuth.Instance, key => new Lazy(() => new AuthWrapper(key))).Value; diff --git a/Plugin.FirebaseAuth.Android/FirebaseAuthImplementation.cs b/Plugin.FirebaseAuth.Android/FirebaseAuthImplementation.cs index 4cdabf0..5bf07f5 100644 --- a/Plugin.FirebaseAuth.Android/FirebaseAuthImplementation.cs +++ b/Plugin.FirebaseAuth.Android/FirebaseAuthImplementation.cs @@ -1,8 +1,4 @@ -using System; -using System.Threading.Tasks; -using Firebase; - -namespace Plugin.FirebaseAuth +namespace Plugin.FirebaseAuth { public class FirebaseAuthImplementation : IFirebaseAuth { diff --git a/Plugin.FirebaseAuth.Android/GitHubAuthProviderWrapper.cs b/Plugin.FirebaseAuth.Android/GitHubAuthProviderWrapper.cs index df11c8d..f119cc4 100644 --- a/Plugin.FirebaseAuth.Android/GitHubAuthProviderWrapper.cs +++ b/Plugin.FirebaseAuth.Android/GitHubAuthProviderWrapper.cs @@ -1,5 +1,4 @@ -using System; -using Firebase.Auth; +using Firebase.Auth; namespace Plugin.FirebaseAuth { public class GitHubAuthProviderWrapper : IGitHubAuthProvider diff --git a/Plugin.FirebaseAuth.Android/GoogleAuthProviderWrapper.cs b/Plugin.FirebaseAuth.Android/GoogleAuthProviderWrapper.cs index 2e18975..bfaefbc 100644 --- a/Plugin.FirebaseAuth.Android/GoogleAuthProviderWrapper.cs +++ b/Plugin.FirebaseAuth.Android/GoogleAuthProviderWrapper.cs @@ -1,5 +1,4 @@ -using System; -using Firebase.Auth; +using Firebase.Auth; namespace Plugin.FirebaseAuth { public class GoogleAuthProviderWrapper : IGoogleAuthProvider diff --git a/Plugin.FirebaseAuth.Android/OAuthProviderWrapper.cs b/Plugin.FirebaseAuth.Android/OAuthProviderWrapper.cs index 77c24bd..3dcd413 100644 --- a/Plugin.FirebaseAuth.Android/OAuthProviderWrapper.cs +++ b/Plugin.FirebaseAuth.Android/OAuthProviderWrapper.cs @@ -1,5 +1,4 @@ -using System; -using Firebase.Auth; +using Firebase.Auth; namespace Plugin.FirebaseAuth { public class OAuthProviderWrapper : IOAuthProvider diff --git a/Plugin.FirebaseAuth.Android/OnCompleteHandler.cs b/Plugin.FirebaseAuth.Android/OnCompleteHandler.cs index 9959294..ec2c7cf 100644 --- a/Plugin.FirebaseAuth.Android/OnCompleteHandler.cs +++ b/Plugin.FirebaseAuth.Android/OnCompleteHandler.cs @@ -1,5 +1,4 @@ -using System; -using Android.Gms.Tasks; +using Android.Gms.Tasks; namespace Plugin.FirebaseAuth { @@ -7,7 +6,7 @@ namespace Plugin.FirebaseAuth internal class OnCompleteHandlerListener : Java.Lang.Object, IOnCompleteListener { - private OnCompleteHandler _handler; + private readonly OnCompleteHandler _handler; public OnCompleteHandlerListener(OnCompleteHandler handler) { diff --git a/Plugin.FirebaseAuth.Android/PhoneAuthCredentialWrapper.cs b/Plugin.FirebaseAuth.Android/PhoneAuthCredentialWrapper.cs index b34745c..089cbfe 100644 --- a/Plugin.FirebaseAuth.Android/PhoneAuthCredentialWrapper.cs +++ b/Plugin.FirebaseAuth.Android/PhoneAuthCredentialWrapper.cs @@ -1,5 +1,4 @@ -using System; -using Firebase.Auth; +using Firebase.Auth; namespace Plugin.FirebaseAuth { public class PhoneAuthCredentialWrapper : AuthCredentialWrapper, IPhoneAuthCredential diff --git a/Plugin.FirebaseAuth.Android/PhoneAuthProviderWrapper.cs b/Plugin.FirebaseAuth.Android/PhoneAuthProviderWrapper.cs index a84b704..f00b139 100644 --- a/Plugin.FirebaseAuth.Android/PhoneAuthProviderWrapper.cs +++ b/Plugin.FirebaseAuth.Android/PhoneAuthProviderWrapper.cs @@ -3,8 +3,6 @@ using Firebase; using Firebase.Auth; using Java.Util.Concurrent; -using Android.App; -using System.Diagnostics; using Plugin.CurrentActivity; namespace Plugin.FirebaseAuth @@ -65,7 +63,7 @@ public Task VerifyPhoneNumberForTestingAsync(IAut private class Callbacks : PhoneAuthProvider.OnVerificationStateChangedCallbacks { - private TaskCompletionSource _tcs; + private readonly TaskCompletionSource _tcs; public Callbacks(TaskCompletionSource tcs) { diff --git a/Plugin.FirebaseAuth.Android/PlayGamesAuthProviderWrapper.cs b/Plugin.FirebaseAuth.Android/PlayGamesAuthProviderWrapper.cs index db4c99c..6dd5b86 100644 --- a/Plugin.FirebaseAuth.Android/PlayGamesAuthProviderWrapper.cs +++ b/Plugin.FirebaseAuth.Android/PlayGamesAuthProviderWrapper.cs @@ -1,5 +1,4 @@ -using System; -using Firebase.Auth; +using Firebase.Auth; namespace Plugin.FirebaseAuth { public class PlayGamesAuthProviderWrapper : IPlayGamesAuthProvider diff --git a/Plugin.FirebaseAuth.Android/TwitterAuthProviderWrapper.cs b/Plugin.FirebaseAuth.Android/TwitterAuthProviderWrapper.cs index b354cf6..1fc8646 100644 --- a/Plugin.FirebaseAuth.Android/TwitterAuthProviderWrapper.cs +++ b/Plugin.FirebaseAuth.Android/TwitterAuthProviderWrapper.cs @@ -1,5 +1,4 @@ -using System; -using Firebase.Auth; +using Firebase.Auth; namespace Plugin.FirebaseAuth { public class TwitterAuthProviderWrapper : ITwitterAuthProvider