Fix all lint and checkstyle violations

samtstern · samtstern · commit 47c1a6c87556 · 2017-06-07T16:00:58.000-07:00
Change-Id: I5ff1752f718b91602020147a91fe56691b09318f
diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.firebase.ui.auth">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -63,11 +64,13 @@
         <activity
             android:name="com.facebook.FacebookActivity"
             android:label="@string/app_name"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"/>
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            tools:ignore="MissingRegistered" />
 
         <activity
             android:name="com.facebook.CustomTabActivity"
-            android:exported="true">
+            android:exported="true"
+            tools:ignore="MissingRegistered">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -451,7 +451,7 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
                     mProviders.add(config);
                 }
 
-                if(config.getProviderId().equals(FACEBOOK_PROVIDER)) {
+                if (config.getProviderId().equals(FACEBOOK_PROVIDER)) {
                     try {
                         Class c = com.facebook.FacebookCallback.class;
                     } catch (NoClassDefFoundError e) {
@@ -461,7 +461,7 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
                     }
                 }
 
-                if(config.getProviderId().equals(TWITTER_PROVIDER)) {
+                if (config.getProviderId().equals(TWITTER_PROVIDER)) {
                     try {
                         Class c = com.twitter.sdk.android.core.TwitterCore.class;
                     } catch (NoClassDefFoundError e) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
@@ -158,7 +158,8 @@ public void onSuccess(AuthResult result) {
                                 result.getUser()
                                         .linkWithCredential(mPrevCredential)
                                         .addOnFailureListener(new TaskFailureLogger(
-                                                TAG, "Error signing in with previous credential " + idpResponse.getProviderType()))
+                                                TAG, "Error signing in with previous credential " +
+                                                idpResponse.getProviderType()))
                                         .addOnCompleteListener(new FinishListener(idpResponse));
                             } else {
                                 finish(ResultCodes.OK, idpResponse.toIntent());
@@ -172,12 +173,14 @@ public void onFailure(@NonNull Exception e) {
                         }
                     })
                     .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "Error signing in with new credential " + idpResponse.getProviderType()));
+                            new TaskFailureLogger(TAG, "Error signing in with new credential " +
+                                    idpResponse.getProviderType()));
         } else {
             currentUser
                     .linkWithCredential(newCredential)
                     .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "Error linking with credential " + idpResponse.getProviderType()))
+                            new TaskFailureLogger(TAG, "Error linking with credential " +
+                                    idpResponse.getProviderType()))
                     .addOnCompleteListener(new FinishListener(idpResponse));
         }
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -169,7 +169,8 @@ public void onSuccess(AuthResult authResult) {
                             authResult.getUser()
                                     .linkWithCredential(authCredential)
                                     .addOnFailureListener(new TaskFailureLogger(
-                                            TAG, "Error signing in with credential " + authCredential.getProvider()))
+                                            TAG, "Error signing in with credential " +
+                                            authCredential.getProvider()))
                                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                                         @Override
                                         public void onSuccess(AuthResult authResult) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
@@ -43,7 +43,10 @@
  * Host Activities should implement {@link CheckEmailListener}.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class CheckEmailFragment extends FragmentBase implements View.OnClickListener, ImeHelper.DonePressedListener {
+public class CheckEmailFragment extends FragmentBase implements
+        View.OnClickListener,
+        ImeHelper.DonePressedListener {
+
     /**
      * Interface to be implemented by Activities hosting this Fragment.
      */
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
@@ -271,8 +271,11 @@ public void onSuccess(String provider) {
                                                     .show();
 
                                             if (provider == null) {
-                                                throw new IllegalStateException(
-                                                        "User has no providers even though we got a FirebaseAuthUserCollisionException");
+                                                String msg =
+                                                        "User has no providers even though " +
+                                                        "we got a " +
+                                                        "FirebaseAuthUserCollisionException";
+                                                throw new IllegalStateException(msg);
                                             } else if (EmailAuthProvider.PROVIDER_ID.equalsIgnoreCase(
                                                     provider)) {
                                                 getActivity().startActivityForResult(
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -152,7 +152,9 @@ public void onSuccess(final IdpResponse response) {
         mActivityHelper.getFirebaseAuth()
                 .signInWithCredential(credential)
                 .addOnFailureListener(
-                        new TaskFailureLogger(TAG, "Firebase sign in with credential " + credential.getProvider() + " unsuccessful. Visit https://console.firebase.google.com to enable it."))
+                        new TaskFailureLogger(TAG, "Firebase sign in with credential "
+                                + credential.getProvider() + " unsuccessful. " +
+                                "Visit https://console.firebase.google.com to enable it."))
                 .addOnCompleteListener(new CredentialSignInHandler(
                         this,
                         mActivityHelper,
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java
@@ -122,4 +122,4 @@ interface ContentChangeCallback {
          */
         void whileIncomplete();
     }
-}
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java
@@ -24,7 +24,7 @@
 
 import com.firebase.ui.auth.R;
 
-final public class CompletableProgressDialog extends ProgressDialog {
+public final class CompletableProgressDialog extends ProgressDialog {
     private ProgressBar mProgress;
     private TextView mMessageView;
     private CharSequence mMessage;
@@ -71,4 +71,4 @@ public void setMessage(CharSequence message) {
             mMessage = message;
         }
     }
-}
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListAdapter.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListAdapter.java
@@ -33,8 +33,8 @@
  * Array adapter used to display a list of countries with section indices.
  */
 final class CountryListAdapter extends ArrayAdapter<CountryInfo> implements SectionIndexer {
-    final private HashMap<String, Integer> alphaIndex = new LinkedHashMap<>();
-    final private HashMap<String, Integer> countryPosition = new LinkedHashMap<>();
+    private final HashMap<String, Integer> alphaIndex = new LinkedHashMap<>();
+    private final HashMap<String, Integer> countryPosition = new LinkedHashMap<>();
     private String[] sections;
 
     public CountryListAdapter(Context context) {
@@ -96,4 +96,4 @@ public int getPositionForCountry(String country) {
         final Integer position = countryPosition.get(country);
         return position == null ? 0 : position;
     }
-}
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListLoadTask.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListLoadTask.java
@@ -28,7 +28,7 @@
 // We need to move away from ListView and AsyncTask in the future and use (say)
 // RecyclerView and Task/ThreadPoolExecutor .
 final class CountryListLoadTask extends AsyncTask<Void, Void, List<CountryInfo>> {
-    private final static int MAX_COUNTRIES = 291;
+    private static final int MAX_COUNTRIES = 291;
 
     private final Listener listener;
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
@@ -182,4 +182,4 @@ public static void hideKeyboard(Context context, View view) {
             imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
         }
     }
-}
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java
@@ -33,14 +33,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 final class PhoneNumberUtils {
-    private final static int DEFAULT_COUNTRY_CODE_INT = 1;
-    private final static String DEFAULT_COUNTRY_CODE = String.valueOf(DEFAULT_COUNTRY_CODE_INT);
-    private final static Locale DEFAULT_LOCALE = Locale.US;
-    private final static CountryInfo DEFAULT_COUNTRY =
+    private static final int DEFAULT_COUNTRY_CODE_INT = 1;
+    private static final String DEFAULT_COUNTRY_CODE = String.valueOf(DEFAULT_COUNTRY_CODE_INT);
+    private static final Locale DEFAULT_LOCALE = Locale.US;
+    private static final CountryInfo DEFAULT_COUNTRY =
             new CountryInfo(DEFAULT_LOCALE, DEFAULT_COUNTRY_CODE_INT);
 
-    private final static int MAX_COUNTRIES = 291;
-    private final static int MAX_COUNTRY_CODES = 286;
+    private static final int MAX_COUNTRIES = 291;
+    private static final int MAX_COUNTRY_CODES = 286;
     private static final int MAX_LENGTH_COUNTRY_CODE = 3;
 
     private static final Map<Integer, List<String>> CountryCodeToRegionCodeMap;
@@ -77,7 +77,7 @@ static String formatPhoneNumber(@NonNull String phoneNumber, @NonNull CountryInf
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             return android.telephony.PhoneNumberUtils
-                    .formatNumberToE164(phoneNumber,countryInfo.locale.getCountry());
+                    .formatNumberToE164(phoneNumber, countryInfo.locale.getCountry());
         }
         return phoneNumber.startsWith("+")
                 ? phoneNumber
@@ -1075,7 +1075,7 @@ private static Map<Integer, List<String>> createCountryCodeToRegionCodeMap() {
         return countryCodeToRegionCodeMap;
     }
 
-    private synchronized static Map<String, Integer> createCountryCodeByIsoMap() {
+    private static synchronized Map<String, Integer> createCountryCodeByIsoMap() {
         final Map<String, Integer> countryCodeByIso = new HashMap<>(MAX_COUNTRIES);
         countryCodeByIso.put("AF", 93);
         countryCodeByIso.put("AX", 358);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SpacedEditText.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SpacedEditText.java
@@ -33,7 +33,7 @@
  * spaces using spannables.
  * This is required since Android's letter spacing is not available until API 21.
  */
-final public class SpacedEditText extends android.support.v7.widget.AppCompatEditText {
+public final class SpacedEditText extends android.support.v7.widget.AppCompatEditText {
     private float proportion;
     private SpannableStringBuilder originalText;
 
@@ -105,4 +105,4 @@ private SpannableStringBuilder getSpacedOutString(CharSequence text) {
     public Editable getUnspacedText() {
         return this.originalText;
     }
-}
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
@@ -40,9 +40,12 @@
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class SubmitConfirmationCodeFragment extends FragmentBase {
-    private static long RESEND_WAIT_MILLIS = 15000;
+
     public static final String TAG = "SubmitConfirmationCodeFragment";
 
+    private static final long RESEND_WAIT_MILLIS = 15000;
+    private static final String EXTRA_MILLIS_UNTIL_FINISHED = "EXTRA_MILLIS_UNTIL_FINISHED";
+
     TextView mEditPhoneTextView;
     TextView mResendCodeTextView;
     TextView mCountDownTextView;
@@ -52,7 +55,7 @@ public class SubmitConfirmationCodeFragment extends FragmentBase {
     PhoneVerificationActivity mVerifier;
     TermsTextView mAgreementText;
     long mMillisUntilFinished;
-    private String EXTRA_MILLIS_UNTIL_FINISHED = "EXTRA_MILLIS_UNTIL_FINISHED";
+
 
 
     public static SubmitConfirmationCodeFragment getInstance(FlowParameters flowParameters,
@@ -97,7 +100,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onStart() {
         super.onStart();
         mConfirmationCodeEditText.requestFocus();
-        InputMethodManager imgr = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imgr = (InputMethodManager) getActivity().getSystemService(
+                Context.INPUT_METHOD_SERVICE);
         imgr.showSoftInput(mConfirmationCodeEditText, 0);
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
@@ -143,7 +143,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                             PhoneNumberUtils
                                     .formatPhoneNumberUsingCurrentCountry(unformattedPhone,
                                                                           getContext());
-                    if(formattedPhone == null) {
+                    if (formattedPhone == null) {
                         Log.e(TAG, "Unable to normalize phone number from hint selector:"
                                 + unformattedPhone);
                         return;
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/GoogleApiHelper.java b/auth/src/main/java/com/firebase/ui/auth/util/GoogleApiHelper.java
@@ -20,7 +20,10 @@
 /**
  * A {@link Task} based wrapper to get a connect {@link GoogleApiClient}.
  */
-public abstract class GoogleApiHelper implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
+public abstract class GoogleApiHelper implements
+        GoogleApiClient.ConnectionCallbacks,
+        GoogleApiClient.OnConnectionFailedListener {
+
     private static final AtomicInteger SAFE_ID = new AtomicInteger(10);
 
     protected GoogleApiClient mClient;
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
@@ -133,7 +133,8 @@ public void onSuccess(final IdpResponse response) {
         mHelper.getFirebaseAuth()
                 .signInWithCredential(credential)
                 .addOnFailureListener(
-                        new TaskFailureLogger(TAG, "Failure authenticating with credential " + credential.getProvider()))
+                        new TaskFailureLogger(TAG, "Failure authenticating with credential " +
+                                credential.getProvider()))
                 .addOnCompleteListener(new CredentialSignInHandler(
                         getActivity(),
                         mHelper,
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -9,7 +9,7 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
-import android.text.TextUtils   ;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.firebase.ui.auth.AuthUI;
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AutoCompleteTask.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AutoCompleteTask.java
@@ -121,7 +121,8 @@ public Task<TResult> addOnFailureListener(@NonNull Activity activity,
 
     @NonNull
     @Override
-    public <TContinuationResult> Task<TContinuationResult> continueWith(@NonNull Continuation<TResult, TContinuationResult> continuation) {
+    public <TContinuationResult> Task<TContinuationResult> continueWith(
+            @NonNull Continuation<TResult, TContinuationResult> continuation) {
         try {
             return Tasks.forResult(continuation.then(Tasks.forResult(mResult)));
         } catch (Exception e) {
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/BaseHelperShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/BaseHelperShadow.java
@@ -40,7 +40,7 @@ public BaseHelperShadow() {
         if (sSaveSmartLock == null) {
             sSaveSmartLock = Mockito.mock(SaveSmartLock.class);
         }
-        if(sPhoneAuthProvider == null) {
+        if (sPhoneAuthProvider == null) {
             sPhoneAuthProvider = Mockito.mock(PhoneAuthProvider.class);
         }
     }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryInfoTests.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryInfoTests.java
@@ -108,4 +108,4 @@ public void testToString() throws Exception {
                 + " +" + usCountryInfo.countryCode;
         assertEquals(expected.toString(), usCountryInfo.toString());
     }
-}
+}
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberTest.java
@@ -83,4 +83,4 @@ public void testIsCountryValid() throws Exception {
                 PhoneTestConstants.US_COUNTRY_CODE);
         assertTrue(PhoneNumber.isCountryValid(validPhoneNumber));
     }
-}
+}
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java
@@ -130,4 +130,4 @@ private void testSpacing(String expectedSpacedText, String expectedOriginalText,
         }
     }
 
-}
+}
diff --git a/library/quality/checkstyle.xml b/library/quality/checkstyle.xml
@@ -109,7 +109,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
         <module name="MethodNameCheck">
             <!-- Validates identifiers for method names. -->
             <metadata name="altname" value="MethodName"/>
-            <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*$"/>
+            <property name="format" value="^(__)?+[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*(__)?+$"/>
             <property name="severity" value="warning"/>
         </module>
 

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {`
`451`	`451`	`mProviders.add(config);`
`452`	`452`	`}`
`453`	`453`
`454`		`- if(config.getProviderId().equals(FACEBOOK_PROVIDER)) {`
	`454`	`+ if (config.getProviderId().equals(FACEBOOK_PROVIDER)) {`
`455`	`455`	`try {`
`456`	`456`	`Class c = com.facebook.FacebookCallback.class;`
`457`	`457`	`} catch (NoClassDefFoundError e) {`
`@@ -461,7 +461,7 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {`
`461`	`461`	`}`
`462`	`462`	`}`
`463`	`463`
`464`		`- if(config.getProviderId().equals(TWITTER_PROVIDER)) {`
	`464`	`+ if (config.getProviderId().equals(TWITTER_PROVIDER)) {`
`465`	`465`	`try {`
`466`	`466`	`Class c = com.twitter.sdk.android.core.TwitterCore.class;`
`467`	`467`	`} catch (NoClassDefFoundError e) {`
Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,4 @@ interface ContentChangeCallback {`
`122`	`122`	`*/`
`123`	`123`	`void whileIncomplete();`
`124`	`124`	`}`
`125`		`-}`
	`125`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`import com.firebase.ui.auth.R;`
`26`	`26`
`27`		`-final public class CompletableProgressDialog extends ProgressDialog {`
	`27`	`+public final class CompletableProgressDialog extends ProgressDialog {`
`28`	`28`	`private ProgressBar mProgress;`
`29`	`29`	`private TextView mMessageView;`
`30`	`30`	`private CharSequence mMessage;`
`@@ -71,4 +71,4 @@ public void setMessage(CharSequence message) {`
`71`	`71`	`mMessage = message;`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`-}`
	`74`	`+}`