Updating activities, Adding Strings, Ln and SafeAsyncTask as well as updating InjectExtra to normal getExtra call. Also cleaned up various imports and added new SherlockAccountAuthenticatorActivity from rtyley source of roboguice-sherlock.

Author: donnfelker

app/pom.xml

@@ -31,16 +31,6 @@
             <artifactId>gson</artifactId>
             <version>2.2.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.rtyley</groupId>
-            <artifactId>roboguice-sherlock</artifactId>
-            <version>1.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.roboguice</groupId>
-            <artifactId>roboguice</artifactId>
-            <version>2.0</version>
-        </dependency>
         <dependency>
             <groupId>com.squareup</groupId>
             <artifactId>dagger</artifactId>
@@ -52,6 +42,11 @@
             <version>${dagger.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.jakewharton</groupId>
+            <artifactId>butterknife</artifactId>
+            <version>1.2.0</version>
+        </dependency>
         <dependency>
             <groupId>com.actionbarsherlock</groupId>
             <artifactId>library</artifactId>

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

@@ -9,10 +9,6 @@
 import android.content.Context;
 
 import com.github.kevinsawicki.http.HttpRequest;
-import com.google.inject.Injector;
-import com.google.inject.Stage;
-
-import roboguice.RoboGuice;
 
 /**
  * Android Bootstrap application
@@ -38,12 +34,7 @@ public BootstrapApplication(final Context context) {
         attachBaseContext(context);
     }
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
 
-        setApplicationInjector(this);
-    }
 
     /**
      * Create main application
@@ -55,14 +46,5 @@ public BootstrapApplication(final Instrumentation instrumentation) {
         attachBaseContext(instrumentation.getTargetContext());
     }
 
-    /**
-     * Sets the application injector. Using the {@link RoboGuice#newDefaultRoboModule} as well as a
-     * custom binding module {@link BootstrapModule} to set up your application module
-     * @param application
-     * @return
-     */
-    public static Injector setApplicationInjector(Application application) {
-        return RoboGuice.setBaseApplicationInjector(application, Stage.DEVELOPMENT, RoboGuice.newDefaultRoboModule
-                (application), new BootstrapModule());
-    }
+
 }

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

@@ -6,7 +6,7 @@
 import com.donnfelker.android.bootstrap.authenticator.ApiKeyProvider;
 import com.donnfelker.android.bootstrap.core.BootstrapService;
 import com.donnfelker.android.bootstrap.core.UserAgentProvider;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 import java.io.IOException;
 

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

@@ -11,7 +11,7 @@
 import android.os.Bundle;
 
 import com.donnfelker.android.bootstrap.core.Constants;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 import java.io.IOException;
 

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

@@ -40,32 +40,30 @@
 
 import com.donnfelker.android.bootstrap.core.Constants;
 import com.donnfelker.android.bootstrap.core.User;
+import com.donnfelker.android.bootstrap.util.Ln;
+import com.donnfelker.android.bootstrap.util.SafeAsyncTask;
+import com.donnfelker.android.bootstrap.util.Strings;
 import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.wishlist.Toaster;
 import com.donnfelker.android.bootstrap.R.id;
 import com.donnfelker.android.bootstrap.R.layout;
 import com.donnfelker.android.bootstrap.R.string;
 import com.donnfelker.android.bootstrap.ui.TextWatcherAdapter;
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockAccountAuthenticatorActivity;
 import com.google.gson.Gson;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import roboguice.inject.InjectView;
-import roboguice.util.Ln;
-import roboguice.util.RoboAsyncTask;
-import roboguice.util.Strings;
+import butterknife.InjectView;
 
 import static com.donnfelker.android.bootstrap.core.Constants.Http.USERNAME;
 import static com.donnfelker.android.bootstrap.core.Constants.Http.PASSWORD;
 
 /**
  * Activity to authenticate the user against an API (example API on Parse.com)
  */
-public class BootstrapAuthenticatorActivity extends
-        RoboSherlockAccountAuthenticatorActivity {
+public class BootstrapAuthenticatorActivity extends SherlockAccountAuthenticatorActivity {
 
     /**
      * PARAM_CONFIRMCREDENTIALS
@@ -90,18 +88,13 @@ public class BootstrapAuthenticatorActivity extends
 
     private AccountManager accountManager;
 
-    @InjectView(id.et_email)
-    private AutoCompleteTextView emailText;
-
-    @InjectView(id.et_password)
-    private EditText passwordText;
-
-    @InjectView(id.b_signin)
-    private Button signinButton;
+    @InjectView(id.et_email) private AutoCompleteTextView emailText;
+    @InjectView(id.et_password) private EditText passwordText;
+    @InjectView(id.b_signin) private Button signinButton;
 
     private TextWatcher watcher = validationTextWatcher();
 
-    private RoboAsyncTask<Boolean> authenticationTask;
+    private SafeAsyncTask<Boolean> authenticationTask;
     private String authToken;
     private String authTokenType;
 
@@ -241,7 +234,7 @@ public void handleLogin(View view) {
         password = passwordText.getText().toString();
         showProgress();
 
-        authenticationTask = new RoboAsyncTask<Boolean>(this) {
+        authenticationTask = new SafeAsyncTask<Boolean>() {
             public Boolean call() throws Exception {
 
                 final String query = String.format("%s=%s&%s=%s", PARAM_USERNAME, email, PARAM_PASSWORD, password);

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

@@ -7,15 +7,16 @@
 import android.util.Log;
 
 import com.donnfelker.android.bootstrap.core.Constants;
-import com.google.inject.Inject;
+import com.donnfelker.android.bootstrap.util.SafeAsyncTask;
+
+import javax.inject.Inject;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
 
-import roboguice.inject.ContextSingleton;
-import roboguice.util.RoboAsyncTask;
 
-@ContextSingleton
+// TODO-dagger: Mark this a s singleton of some sort, maybe.
+// @ContextSingleton
 public class LogoutService {
 
     @Inject protected Context context;
@@ -28,12 +29,13 @@ public void logout(final Runnable onSuccess) {
         new LogoutTask(context, onSuccess).execute();
     }
 
-    private static class LogoutTask extends RoboAsyncTask<Boolean> {
+    private static class LogoutTask extends SafeAsyncTask<Boolean> {
 
+        private final Context context;
         private Runnable onSuccess;
 
         protected LogoutTask(Context context, Runnable onSuccess) {
-            super(context);
+            this.context = context;
             this.onSuccess = onSuccess;
         }
 

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

@@ -0,0 +1,86 @@
+package com.donnfelker.android.bootstrap.authenticator;
+
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import com.actionbarsherlock.app.SherlockActivity;
+
+/**
+ * Base class for implementing an Activity that is used to help implement an
+ * AbstractAccountAuthenticator. If the AbstractAccountAuthenticator needs to use an activity
+ * to handle the request then it can have the activity extend SherlockAccountAuthenticatorActivity.
+ * The AbstractAccountAuthenticator passes in the response to the intent using the following:
+ * <pre>
+ *      intent.putExtra({@link android.accounts.AccountManager#KEY_ACCOUNT_AUTHENTICATOR_RESPONSE}, response);
+ * </pre>
+ * The activity then sets the result that is to be handed to the response via
+ * {@link #setAccountAuthenticatorResult(android.os.Bundle)}.
+ * This result will be sent as the result of the request when the activity finishes. If this
+ * is never set or if it is set to null then error {@link android.accounts.AccountManager#ERROR_CODE_CANCELED}
+ * will be called on the response.
+ */
+public class SherlockAccountAuthenticatorActivity extends SherlockActivity {
+    private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
+    private Bundle mResultBundle = null;
+
+    /**
+     * Set the result that is to be sent as the result of the request that caused this
+     * Activity to be launched. If result is null or this method is never called then
+     * the request will be canceled.
+     * @param result this is returned as the result of the AbstractAccountAuthenticator request
+     */
+    public final void setAccountAuthenticatorResult(Bundle result) {
+        mResultBundle = result;
+    }
+
+    /**
+     * Retreives the AccountAuthenticatorResponse from either the intent of the icicle, if the
+     * icicle is non-zero.
+     * @param icicle the save instance data of this Activity, may be null
+     */
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mAccountAuthenticatorResponse =
+                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
+
+        if (mAccountAuthenticatorResponse != null) {
+            mAccountAuthenticatorResponse.onRequestContinued();
+        }
+    }
+
+    /**
+     * Sends the result or a Constants.ERROR_CODE_CANCELED error if a result isn't present.
+     */
+    public void finish() {
+        if (mAccountAuthenticatorResponse != null) {
+            // send the result bundle back if set, otherwise send an error.
+            if (mResultBundle != null) {
+                mAccountAuthenticatorResponse.onResult(mResultBundle);
+            } else {
+                mAccountAuthenticatorResponse.onError(AccountManager.ERROR_CODE_CANCELED,
+                        "canceled");
+            }
+            mAccountAuthenticatorResponse = null;
+        }
+        super.finish();
+    }
+}

app/src/main/java/com/donnfelker/android/bootstrap/core/AvatarLoader.java

@@ -14,8 +14,9 @@
 
 import com.actionbarsherlock.app.ActionBar;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.util.SafeAsyncTask;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -26,7 +27,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import roboguice.util.RoboAsyncTask;
 
 /**
  * Avatar utilities
@@ -40,13 +40,13 @@ public class AvatarLoader {
     private static final int CACHE_SIZE = 75;
 
     private static abstract class FetchAvatarTask extends
-            RoboAsyncTask<BitmapDrawable> {
+            SafeAsyncTask<BitmapDrawable> {
 
         private static final Executor EXECUTOR = Executors
                 .newFixedThreadPool(1);
 
         private FetchAvatarTask(Context context) {
-            super(context, EXECUTOR);
+            super(EXECUTOR);
         }
 
         @Override

app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java

@@ -3,6 +3,7 @@
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.Service;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
@@ -12,17 +13,16 @@
 
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.ui.BootstrapTimerActivity;
-import com.google.inject.Inject;
+import javax.inject.Inject;
+
+import com.donnfelker.android.bootstrap.util.Ln;
 import com.squareup.otto.Bus;
 import com.squareup.otto.Produce;
 import com.squareup.otto.Subscribe;
 
-import roboguice.service.RoboService;
-import roboguice.util.Ln;
-
 import static com.donnfelker.android.bootstrap.core.Constants.Notification.TIMER_NOTIFICATION_ID;
 
-public class TimerService extends RoboService {
+public class TimerService extends Service {
 
     @Inject protected Bus BUS;
     @Inject private NotificationManager notificationManager;

app/src/main/java/com/donnfelker/android/bootstrap/core/UserAgentProvider.java

@@ -6,15 +6,17 @@
 import android.os.Build;
 import android.telephony.TelephonyManager;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import com.donnfelker.android.bootstrap.util.Ln;
+import com.donnfelker.android.bootstrap.util.Strings;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import roboguice.util.Ln;
-import roboguice.util.Strings;
 
 public class UserAgentProvider implements Provider<String> {
     @Inject protected Application app;

app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapActivity.java

@@ -4,13 +4,23 @@
 import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
 import android.content.Intent;
 
+import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.MenuItem;
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockActivity;
+
+import butterknife.Views;
 
 /**
  * Base activity for a Bootstrap activity which does not use fragments.
  */
-public abstract class BootstrapActivity extends RoboSherlockActivity {
+public abstract class BootstrapActivity extends SherlockActivity {
+
+    @Override
+    public void setContentView(int layoutResId) {
+        super.setContentView(layoutResId);
+
+        // Used to inject views with the Butterknife library
+        Views.inject(this);
+    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {