Guard against null auth token label

kevinsawicki · kevinsawicki · commit 5c0b0320700a · 2012-07-10T09:43:55.000-07:00
Call equals method on constant which will never be null
instead of auth token label variable
diff --git a/app/src/main/java/com/github/mobile/accounts/AccountAuthenticator.java b/app/src/main/java/com/github/mobile/accounts/AccountAuthenticator.java
@@ -78,7 +78,7 @@ public Bundle getAuthToken(AccountAuthenticatorResponse response,
 
     @Override
     public String getAuthTokenLabel(String authTokenType) {
-        if (authTokenType.equals(ACCOUNT_TYPE))
+        if (ACCOUNT_TYPE.equals(authTokenType))
             return authTokenType;
         return null;
     }
diff --git a/app/src/main/java/com/github/mobile/accounts/LoginActivity.java b/app/src/main/java/com/github/mobile/accounts/LoginActivity.java
@@ -345,7 +345,7 @@ protected void finishLogin() {
         authToken = password;
         intent.putExtra(KEY_ACCOUNT_NAME, username);
         intent.putExtra(KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
-        if (authTokenType != null && authTokenType.equals(ACCOUNT_TYPE))
+        if (ACCOUNT_TYPE.equals(authTokenType))
             intent.putExtra(KEY_AUTHTOKEN, authToken);
         setAccountAuthenticatorResult(intent.getExtras());
         setResult(RESULT_OK, intent);

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public Bundle getAuthToken(AccountAuthenticatorResponse response,`
`78`	`78`
`79`	`79`	`@Override`
`80`	`80`	`public String getAuthTokenLabel(String authTokenType) {`
`81`		`- if (authTokenType.equals(ACCOUNT_TYPE))`
	`81`	`+ if (ACCOUNT_TYPE.equals(authTokenType))`
`82`	`82`	`return authTokenType;`
`83`	`83`	`return null;`
`84`	`84`	`}`