Remove all deprecated APIs

Signed-off-by: Alex Saveau <[email protected]>

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -87,7 +87,7 @@
  * See the <a href="https://github.com/firebase/FirebaseUI-Android/blob/master/auth/README.md#table-of-contents">README</a>
  * for examples on how to get started with FirebaseUI Auth.
  */
-public class AuthUI {
+public final class AuthUI {
 
     private static final String TAG = "AuthUI";
 
@@ -101,79 +101,6 @@ public class AuthUI {
     @Retention(RetentionPolicy.SOURCE)
     public @interface SupportedProvider {}
 
-    /**
-     * Provider identifier for email and password credentials, for use with {@link
-     * SignInIntentBuilder#setAvailableProviders(List)}.
-     *
-     * @deprecated this constant is no longer needed, use the {@link IdpConfig.EmailBuilder}
-     * directly or {@link EmailAuthProvider#PROVIDER_ID} if needed.
-     */
-    @Deprecated
-    public static final String EMAIL_PROVIDER = EmailAuthProvider.PROVIDER_ID;
-
-    /**
-     * Provider identifier for Google, for use with {@link SignInIntentBuilder#setAvailableProviders(List)}.
-     *
-     * @deprecated this constant is no longer needed, use the {@link IdpConfig.GoogleBuilder}
-     * directly or {@link GoogleAuthProvider#PROVIDER_ID} if needed.
-     */
-    @Deprecated
-    public static final String GOOGLE_PROVIDER = GoogleAuthProvider.PROVIDER_ID;
-
-    /**
-     * Provider identifier for Facebook, for use with {@link SignInIntentBuilder#setAvailableProviders(List)}.
-     *
-     * @deprecated this constant is no longer needed, use the {@link IdpConfig.FacebookBuilder}
-     * directly or {@link FacebookAuthProvider#PROVIDER_ID} if needed.
-     */
-    @Deprecated
-    public static final String FACEBOOK_PROVIDER = FacebookAuthProvider.PROVIDER_ID;
-
-    /**
-     * Provider identifier for Twitter, for use with {@link SignInIntentBuilder#setAvailableProviders(List)}.
-     *
-     * @deprecated this constant is no longer needed, use the {@link IdpConfig.TwitterBuilder}
-     * directly or {@link TwitterAuthProvider#PROVIDER_ID} if needed.
-     */
-    @Deprecated
-    public static final String TWITTER_PROVIDER = TwitterAuthProvider.PROVIDER_ID;
-
-    /**
-     * Provider identifier for Phone, for use with {@link SignInIntentBuilder#setAvailableProviders(List)}.
-     *
-     * @deprecated this constant is no longer needed, use the {@link IdpConfig.PhoneBuilder}
-     * directly or {@link PhoneAuthProvider#PROVIDER_ID} if needed.
-     */
-    @Deprecated
-    public static final String PHONE_VERIFICATION_PROVIDER = PhoneAuthProvider.PROVIDER_ID;
-
-    /**
-     * Bundle key for the default full phone number parameter.
-     *
-     * @deprecated this constant is no longer needed, use {@link IdpConfig.PhoneBuilder#setDefaultNumber(String)}
-     * instead.
-     */
-    @Deprecated
-    public static final String EXTRA_DEFAULT_PHONE_NUMBER = ExtraConstants.PHONE;
-
-    /**
-     * Bundle key for the default phone country code parameter.
-     *
-     * @deprecated this constant is no longer needed, use {@link IdpConfig.PhoneBuilder#setDefaultNumber(String,
-     * String)} instead.
-     */
-    @Deprecated
-    public static final String EXTRA_DEFAULT_COUNTRY_CODE = ExtraConstants.COUNTRY_ISO;
-
-    /**
-     * Bundle key for the default national phone number parameter.
-     *
-     * @deprecated this constant is no longer needed, use {@link IdpConfig.PhoneBuilder#setDefaultNumber(String,
-     * String)} instead.
-     */
-    @Deprecated
-    public static final String EXTRA_DEFAULT_NATIONAL_NUMBER = ExtraConstants.NATIONAL_NUMBER;
-
     /**
      * Default value for logo resource, omits the logo from the {@link AuthMethodPickerActivity}.
      */
@@ -500,7 +427,7 @@ public SignInIntentBuilder createSignInIntentBuilder() {
     /**
      * Configuration for an identity provider.
      */
-    public static class IdpConfig implements Parcelable {
+    public static final class IdpConfig implements Parcelable {
         public static final Creator<IdpConfig> CREATOR = new Creator<IdpConfig>() {
             @Override
             public IdpConfig createFromParcel(Parcel in) {
@@ -534,32 +461,6 @@ public String getProviderId() {
             return mProviderId;
         }
 
-        /**
-         * @deprecated use the lists of scopes you passed in directly, or get a provider-specific
-         * implementation from {@link #getParams()}.
-         */
-        @Deprecated
-        @NonNull
-        public List<String> getScopes() {
-            List<String> permissions;
-            if (mProviderId.equals(GoogleAuthProvider.PROVIDER_ID)) {
-                Scope[] array = ((GoogleSignInOptions)
-                        mParams.getParcelable(ExtraConstants.GOOGLE_SIGN_IN_OPTIONS))
-                        .getScopeArray();
-
-                List<String> scopes = new ArrayList<>();
-                for (Scope scope : array) {
-                    scopes.add(scope.toString());
-                }
-                permissions = scopes;
-            } else if (mProviderId.equals(FacebookAuthProvider.PROVIDER_ID)) {
-                permissions = mParams.getStringArrayList(ExtraConstants.FACEBOOK_PERMISSIONS);
-            } else {
-                permissions = null;
-            }
-            return permissions == null ? Collections.<String>emptyList() : permissions;
-        }
-
         /**
          * @return provider-specific options
          */
@@ -611,16 +512,7 @@ public static class Builder {
             @SupportedProvider private final String mProviderId;
             private final Bundle mParams = new Bundle();
 
-            /**
-             * Builds the configuration parameters for an identity provider.
-             *
-             * @param providerId An ID of one of the supported identity providers. e.g. {@link
-             *                   AuthUI#GOOGLE_PROVIDER}. See {@link AuthUI#SUPPORTED_PROVIDERS} for
-             *                   the complete list of supported Identity providers
-             * @deprecated use the provider's specific builder, for example, {@link GoogleBuilder}
-             */
-            @Deprecated
-            public Builder(@SupportedProvider @NonNull String providerId) {
+            protected Builder(@SupportedProvider @NonNull String providerId) {
                 if (!SUPPORTED_PROVIDERS.contains(providerId)) {
                     throw new IllegalArgumentException("Unknown provider: " + providerId);
                 }
@@ -629,69 +521,13 @@ public Builder(@SupportedProvider @NonNull String providerId) {
 
             @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
             @NonNull
-            protected Bundle getParams() {
+            protected final Bundle getParams() {
                 return mParams;
             }
 
-            /**
-             * @deprecated additional phone verification options are now available on the phone
-             * builder: {@link PhoneBuilder#setDefaultNumber(String, String)}.
-             */
-            @NonNull
-            @Deprecated
-            public Builder setParams(@Nullable Bundle params) {
-                mParams.clear();
-                mParams.putAll(params == null ? new Bundle() : params);
-                return this;
-            }
-
-            /**
-             * Specifies the additional permissions that the application will request for this
-             * identity provider.
-             * <p>
-             * For Facebook permissions see:
-             * https://developers.facebook.com/docs/facebook-login/android
-             * https://developers.facebook.com/docs/facebook-login/permissions
-             * <p>
-             * For Google permissions see:
-             * https://developers.google.com/identity/protocols/googlescopes
-             * <p>
-             * Twitter permissions are only configurable through the
-             * <a href="https://apps.twitter.com/">Twitter developer console</a>.
-             *
-             * @deprecated use the provider's specific builder. For Google, use {@link
-             * GoogleBuilder#setScopes(List)}. For Facebook, use {@link FacebookBuilder#setPermissions(List)}.
-             */
-            @NonNull
-            @Deprecated
-            public Builder setPermissions(@Nullable List<String> permissions) {
-                if (permissions == null) {
-                    mParams.clear();
-                    return this;
-                }
-
-                Bundle params;
-                if (mProviderId.equals(GOOGLE_PROVIDER)) {
-                    params = new GoogleBuilder().setScopes(permissions).build().getParams();
-                } else if (mProviderId.equals(FACEBOOK_PROVIDER)) {
-                    params = new FacebookBuilder().setPermissions(permissions).build().getParams();
-                } else {
-                    params = new Bundle();
-                }
-                setParams(params);
-                return this;
-            }
-
             @CallSuper
             @NonNull
             public IdpConfig build() {
-                // Ensures deprecated Google provider builder backcompat
-                if (mProviderId.equals(GoogleAuthProvider.PROVIDER_ID)
-                        && getClass() == Builder.class
-                        && mParams.isEmpty()) {
-                    return new GoogleBuilder().build();
-                }
-
                 return new IdpConfig(mProviderId, mParams);
             }
         }
@@ -701,7 +537,6 @@ && getClass() == Builder.class
          */
         public static final class EmailBuilder extends Builder {
             public EmailBuilder() {
-                //noinspection deprecation taking a hit for the backcompat team
                 super(EmailAuthProvider.PROVIDER_ID);
             }
 
@@ -734,7 +569,6 @@ public EmailBuilder setRequireName(boolean requireName) {
          */
         public static final class PhoneBuilder extends Builder {
             public PhoneBuilder() {
-                //noinspection deprecation taking a hit for the backcompat team
                 super(PhoneAuthProvider.PROVIDER_ID);
             }
 
@@ -807,7 +641,6 @@ public PhoneBuilder setDefaultCountryIso(@NonNull String iso) {
          */
         public static final class GoogleBuilder extends Builder {
             public GoogleBuilder() {
-                //noinspection deprecation taking a hit for the backcompat team
                 super(GoogleAuthProvider.PROVIDER_ID);
                 Preconditions.checkConfigured(getApplicationContext(),
                         "Check your google-services plugin configuration, the" +
@@ -871,7 +704,6 @@ public static final class FacebookBuilder extends Builder {
             private static final String TAG = "FacebookBuilder";
 
             public FacebookBuilder() {
-                //noinspection deprecation taking a hit for the backcompat team
                 super(FacebookAuthProvider.PROVIDER_ID);
                 if (!ProviderAvailability.IS_FACEBOOK_AVAILABLE) {
                     throw new RuntimeException(
@@ -895,7 +727,6 @@ public FacebookBuilder() {
              * Facebook Login SDK. Available permissions can be found <a
              * href="https://developers.facebook.com/docs/facebook-login/permissions">here</a>.
              */
-            @SuppressWarnings({"deprecation", "NullableProblems"}) // For backcompat
             @NonNull
             public FacebookBuilder setPermissions(@NonNull List<String> permissions) {
                 getParams().putStringArrayList(
@@ -909,7 +740,6 @@ public FacebookBuilder setPermissions(@NonNull List<String> permissions) {
          */
         public static final class TwitterBuilder extends Builder {
             public TwitterBuilder() {
-                //noinspection deprecation taking a hit for the backcompat team
                 super(TwitterAuthProvider.PROVIDER_ID);
                 if (!ProviderAvailability.IS_TWITTER_AVAILABLE) {
                     throw new RuntimeException(
@@ -940,8 +770,6 @@ private abstract class AuthIntentBuilder<T extends AuthIntentBuilder> {
         boolean mEnableCredentials = true;
         boolean mEnableHints = true;
 
-        private AuthIntentBuilder() {}
-
         /**
          * Specifies the theme to use for the application flow. If no theme is specified, a default
          * theme will be used.
@@ -1011,34 +839,6 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
             return (T) this;
         }
 
-        /**
-         * Specified the set of supported authentication providers. At least one provider must be
-         * specified. There may only be one instance of each provider.
-         * <p>
-         * <p>If no providers are explicitly specified by calling this method, then the email
-         * provider is the default supported provider.
-         *
-         * @param idpConfigs a list of {@link IdpConfig}s, where each {@link IdpConfig} contains the
-         *                   configuration parameters for the IDP.
-         * @see IdpConfig
-         * @deprecated because the order in which providers were displayed was the inverse of the
-         * order in which they were supplied. Use {@link #setAvailableProviders(List)} to display
-         * the providers in the order in which they were supplied.
-         */
-        @Deprecated
-        public T setProviders(@NonNull List<IdpConfig> idpConfigs) {
-            setAvailableProviders(idpConfigs);
-
-            // Ensure email provider is at the bottom to keep backwards compatibility
-            int emailProviderIndex = mProviders.indexOf(new IdpConfig.Builder(EMAIL_PROVIDER).build());
-            if (emailProviderIndex != -1) {
-                mProviders.add(0, mProviders.remove(emailProviderIndex));
-            }
-            Collections.reverse(mProviders);
-
-            return (T) this;
-        }
-
         /**
          * Enables or disables the use of Smart Lock for Passwords in the sign in flow. To
          * (en)disable hint selector and credential selector independently use {@link
@@ -1086,45 +886,10 @@ public Intent build() {
      * Builder for the intent to start the user authentication flow.
      */
     public final class SignInIntentBuilder extends AuthIntentBuilder<SignInIntentBuilder> {
-        private Boolean mAllowNewEmailAccounts;
-
         private SignInIntentBuilder() {
             super();
         }
 
-        /**
-         * Enables or disables creating new accounts in the email sign in flow.
-         * <p>
-         * <p>Account creation is enabled by default.
-         *
-         * @deprecated set this option directly on the email builder: {@link
-         * IdpConfig.EmailBuilder#setAllowNewAccounts(boolean)}.
-         */
-        @NonNull
-        @Deprecated
-        public SignInIntentBuilder setAllowNewEmailAccounts(boolean enabled) {
-            mAllowNewEmailAccounts = enabled;
-            return this;
-        }
-
-        @NonNull
-        @Override
-        public Intent build() {
-            if (mAllowNewEmailAccounts != null) {
-                // To ensure setAllowNewEmailAccounts backcompat
-                for (int i = 0; i < mProviders.size(); i++) {
-                    if (mProviders.get(i).getProviderId().equals(EmailAuthProvider.PROVIDER_ID)) {
-                        mProviders.set(i, new IdpConfig.EmailBuilder()
-                                .setAllowNewAccounts(mAllowNewEmailAccounts)
-                                .build());
-                        break;
-                    }
-                }
-            }
-
-            return super.build();
-        }
-
         @Override
         protected FlowParameters getFlowParams() {
             return new FlowParameters(

auth/src/main/java/com/firebase/ui/auth/IdpResponse.java

@@ -14,7 +14,6 @@
 
 package com.firebase.ui.auth;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -172,20 +171,6 @@ public String getIdpSecret() {
         return mSecret;
     }
 
-    /**
-     * Get the error code for a failed sign in
-     *
-     * @deprecated use {@link #getError()} instead
-     */
-    @Deprecated
-    public int getErrorCode() {
-        if (isSuccessful()) {
-            return Activity.RESULT_OK;
-        } else {
-            return mException.getErrorCode();
-        }
-    }
-
     /**
      * Get the error for a failed sign in.
      */