Merge branch 'code-style' into code-style-merge

Trying to get code to be conform with Android's Guidelines.

Author: danielkutik

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapApplication.java

@@ -16,16 +16,16 @@
  */
 public class BootstrapApplication extends Application {
 
-    private static BootstrapApplication instance;
+    private static BootstrapApplication sInstance;
 
     /**
      * Create main application
      */
     public BootstrapApplication() {
-
         // Disable http.keepAlive on Froyo and below
-        if (SDK_INT <= FROYO)
+        if (SDK_INT <= FROYO) {
             HttpRequest.keepAlive(false);
+        }
     }
 
     /**
@@ -36,14 +36,13 @@ public BootstrapApplication() {
     public BootstrapApplication(final Context context) {
         this();
         attachBaseContext(context);
-
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
 
-        instance = this;
+        sInstance = this;
 
         // Perform injection
         Injector.init(getRootModule(), this);
@@ -66,6 +65,6 @@ public BootstrapApplication(final Instrumentation instrumentation) {
     }
 
     public static BootstrapApplication getInstance() {
-        return instance;
+        return sInstance;
     }
 }

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java

@@ -17,8 +17,8 @@
  */
 public class BootstrapServiceProvider {
 
-    @Inject ApiKeyProvider keyProvider;
-    @Inject UserAgentProvider userAgentProvider;
+    @Inject ApiKeyProvider mKeyProvider;
+    @Inject UserAgentProvider mUserAgentProvider;
 
     /**
      * Get service for configured key provider
@@ -30,6 +30,6 @@ public class BootstrapServiceProvider {
      * @throws AccountsException
      */
     public BootstrapService getService(Activity activity) throws IOException, AccountsException {
-        return new BootstrapService(keyProvider.getAuthKey(activity), userAgentProvider);
+        return new BootstrapService(mKeyProvider.getAuthKey(activity), mUserAgentProvider);
     }
 }

app/src/main/java/com/donnfelker/android/bootstrap/Injector.java

@@ -3,8 +3,8 @@
 import dagger.ObjectGraph;
 
 public final class Injector {
-    public static ObjectGraph objectGraph = null;
 
+    public static ObjectGraph objectGraph = null;  //TODO why is this public?
 
     public static void init(final Object rootModule) {
 

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/AccountAuthenticatorService.java

@@ -8,20 +8,24 @@
 import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT;
 
 /**
- * Authenticator service that returns a subclass of AbstractAccountAuthenticator in onBind()
+ * Authenticator service that returns a subclass of AbstractAccountAuthenticator in onBind().
  */
 public class AccountAuthenticatorService extends Service {
 
-    private static BootstrapAccountAuthenticator AUTHENTICATOR = null;
+    private static BootstrapAccountAuthenticator sAuthenticator = null;
 
     @Override
-    public IBinder onBind(Intent intent) {
-        return ACTION_AUTHENTICATOR_INTENT.equals(intent.getAction()) ? getAuthenticator().getIBinder() : null;
+    public IBinder onBind(final Intent intent) {
+        if (intent != null && ACTION_AUTHENTICATOR_INTENT.equals(intent.getAction())) {
+            return getAuthenticator().getIBinder();
+        }
+        return null;
     }
 
     private BootstrapAccountAuthenticator getAuthenticator() {
-        if (AUTHENTICATOR == null)
-            AUTHENTICATOR = new BootstrapAccountAuthenticator(this);
-        return AUTHENTICATOR;
+        if (sAuthenticator == null) {
+            sAuthenticator = new BootstrapAccountAuthenticator(this);
+        }
+        return sAuthenticator;
     }
 }

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java

@@ -8,31 +8,33 @@
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.donnfelker.android.bootstrap.core.Constants;
-
 import java.io.IOException;
 
 import javax.inject.Inject;
 
 import static android.accounts.AccountManager.KEY_AUTHTOKEN;
+import static com.donnfelker.android.bootstrap.core.Constants.Auth.AUTHTOKEN_TYPE;
+import static com.donnfelker.android.bootstrap.core.Constants.Auth.BOOTSTRAP_ACCOUNT_TYPE;
 
 /**
  * Bridge class that obtains a API key for the currently configured account
  */
 public class ApiKeyProvider {
 
-    @Inject AccountManager accountManager;
+    @Inject protected AccountManager mAccountManager;
 
     /**
-     * This call blocks, so shouldn't be called on the UI thread
+     * This call blocks, so shouldn't be called on the UI thread.
      *
-     * @return API key to be used for authorization with a {@link com.donnfelker.android.bootstrap.core.BootstrapService} instance
+     * @return API key to be used for authorization with a
+     * {@link com.donnfelker.android.bootstrap.core.BootstrapService} instance
      * @throws AccountsException
      * @throws IOException
      */
-    public String getAuthKey(Activity activity) throws AccountsException, IOException {
-        AccountManagerFuture<Bundle> accountManagerFuture = accountManager.getAuthTokenByFeatures(Constants.Auth.BOOTSTRAP_ACCOUNT_TYPE,
-                Constants.Auth.AUTHTOKEN_TYPE, new String[0], activity, null, null, null, null);
+    public String getAuthKey(final Activity activity) throws AccountsException, IOException {
+        final AccountManagerFuture<Bundle> accountManagerFuture
+                = mAccountManager.getAuthTokenByFeatures(BOOTSTRAP_ACCOUNT_TYPE,
+                AUTHTOKEN_TYPE, new String[0], activity, null, null, null, null);
 
         return accountManagerFuture.getResult().getString(KEY_AUTHTOKEN);
     }

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAccountAuthenticator.java

@@ -25,43 +25,49 @@ class BootstrapAccountAuthenticator extends AbstractAccountAuthenticator {
 
     private static final String DESCRIPTION_CLIENT = "Bootstrap for Android";
 
-    private final Context context;
+    private final Context mContext;
 
-    public BootstrapAccountAuthenticator(Context context) {
+    public BootstrapAccountAuthenticator(final Context context) {
         super(context);
 
-        this.context = context;
+        mContext = context;
     }
 
     /*
-     * The user has requested to add a new account to the system. We return an intent that will launch our login screen
-     * if the user has not logged in yet, otherwise our activity will just pass the user's credentials on to the account
-     * manager.
+     * The user has requested to add a new account to the system. We return an intent that will
+     * launch our login screen if the user has not logged in yet, otherwise our activity will
+     * just pass the user's credentials on to the account manager.
      */
     @Override
-    public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType,
-                             String[] requiredFeatures, Bundle options) throws NetworkErrorException {
-        final Intent intent = new Intent(context, BootstrapAuthenticatorActivity.class);
+    public Bundle addAccount(final AccountAuthenticatorResponse response, final String accountType,
+                             final String authTokenType, final String[] requiredFeatures,
+                             final Bundle options) throws NetworkErrorException {
+        final Intent intent = new Intent(mContext, BootstrapAuthenticatorActivity.class);
         intent.putExtra(PARAM_AUTHTOKEN_TYPE, authTokenType);
         intent.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
+
         final Bundle bundle = new Bundle();
         bundle.putParcelable(KEY_INTENT, intent);
+
         return bundle;
     }
 
     @Override
-    public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) {
+    public Bundle confirmCredentials(final AccountAuthenticatorResponse response,
+                                     final Account account, final Bundle options) {
         return null;
     }
 
     @Override
-    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+    public Bundle editProperties(final AccountAuthenticatorResponse response,
+                                 final String accountType) {
         return null;
     }
 
     /**
      * This method gets called when the
-     * {@link com.donnfelker.android.bootstrap.authenticator.ApiKeyProvider#getAuthKey()} methods gets invoked.
+     * {@link com.donnfelker.android.bootstrap.authenticator.ApiKeyProvider#getAuthKey()}
+     * methods gets invoked.
      * This happens on a different process, so debugging it can be a beast.
      *
      * @param response
@@ -72,35 +78,39 @@ public Bundle editProperties(AccountAuthenticatorResponse response, String accou
      * @throws NetworkErrorException
      */
     @Override
-    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType,
-                               Bundle options) throws NetworkErrorException {
+    public Bundle getAuthToken(final AccountAuthenticatorResponse response,
+                               final Account account, final String authTokenType,
+                               final Bundle options) throws NetworkErrorException {
 
         Ln.d("Attempting to get authToken");
 
-        String authToken = AccountManager.get(context).peekAuthToken(account, authTokenType);
-        Bundle bundle = new Bundle();
+        final String authToken = AccountManager.get(mContext).peekAuthToken(account, authTokenType);
+
+        final Bundle bundle = new Bundle();
         bundle.putString(KEY_ACCOUNT_NAME, account.name);
         bundle.putString(KEY_ACCOUNT_TYPE, Constants.Auth.BOOTSTRAP_ACCOUNT_TYPE);
         bundle.putString(KEY_AUTHTOKEN, authToken);
+
         return bundle;
     }
 
     @Override
-    public String getAuthTokenLabel(String authTokenType) {
+    public String getAuthTokenLabel(final String authTokenType) {
         return authTokenType.equals(Constants.Auth.AUTHTOKEN_TYPE) ? authTokenType : null;
     }
 
     @Override
-    public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features)
-            throws NetworkErrorException {
+    public Bundle hasFeatures(final AccountAuthenticatorResponse response, final Account account,
+                              final String[] features) throws NetworkErrorException {
         final Bundle result = new Bundle();
         result.putBoolean(KEY_BOOLEAN_RESULT, false);
         return result;
     }
 
     @Override
-    public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType,
-                                    Bundle options) {
+    public Bundle updateCredentials(final AccountAuthenticatorResponse response,
+                                    final Account account, final String authTokenType,
+                                    final Bundle options) {
         return null;
     }
 }