Updating code to include dagger ioc. Still does not build, broken on generic implementation. Needs work.

Author: donnfelker

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

@@ -1,21 +1,36 @@
 package com.donnfelker.android.bootstrap;
 
+import android.accounts.AccountManager;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.preference.PreferenceManager;
 import android.telephony.TelephonyManager;
 import android.view.inputmethod.InputMethodManager;
 
+import javax.inject.Singleton;
+
 import dagger.Module;
 import dagger.Provides;
 
-@Module(
+/**
+ * Module for all Android related provisions
+ */
+@Module
+(
         complete = false
 )
 public class AndroidModule {
 
+    @Provides
+    @Singleton
+    Context provideAppContext()
+    {
+        return BootstrapApplication.getInstance().getApplicationContext();
+    }
+
     @Provides
     SharedPreferences provideDefaultSharedPreferences(final Context context)
     {
@@ -53,5 +68,19 @@ InputMethodManager provideInputMethodManager(final Context context)
         return (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
+    @Provides
+    ApplicationInfo provideApplicationInfo(final Context context) {
+        return context.getApplicationInfo();
+    }
+
+    @Provides
+    AccountManager provideAccountManager(final Context context) {
+        return AccountManager.get(context);
+    }
+
+    @Provides
+    ClassLoader provideClassLoader(final Context context) {
+        return context.getClassLoader();
+    }
 
 }

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

@@ -15,10 +15,15 @@
  */
 public class BootstrapApplication extends Application {
 
+    private static BootstrapApplication instance;
+
     /**
      * Create main application
      */
     public BootstrapApplication() {
+
+        instance = this;
+
         // Disable http.keepAlive on Froyo and below
         if (SDK_INT <= FROYO)
             HttpRequest.keepAlive(false);
@@ -47,4 +52,7 @@ public BootstrapApplication(final Instrumentation instrumentation) {
     }
 
 
+    public static BootstrapApplication getInstance() {
+        return instance;
+    }
 }

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

@@ -1,7 +1,18 @@
 package com.donnfelker.android.bootstrap;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
+import android.accounts.AccountManager;
+import android.content.Context;
+
+import com.donnfelker.android.bootstrap.authenticator.LogoutService;
+import com.donnfelker.android.bootstrap.core.CheckIn;
+import com.donnfelker.android.bootstrap.ui.BootstrapTimerActivity;
+import com.donnfelker.android.bootstrap.ui.CarouselActivity;
+import com.donnfelker.android.bootstrap.ui.CheckInsListFragment;
+import com.donnfelker.android.bootstrap.ui.ItemListFragment;
+import com.donnfelker.android.bootstrap.ui.NewsActivity;
+import com.donnfelker.android.bootstrap.ui.NewsListFragment;
+import com.donnfelker.android.bootstrap.ui.UserActivity;
+import com.donnfelker.android.bootstrap.ui.UserListFragment;
 import com.squareup.otto.Bus;
 
 import javax.inject.Singleton;
@@ -11,18 +22,23 @@
 
 /**
  * Dagger module for setting up provides statements.
+ * Register all of your entry points below.
  */
 @Module
 (
         complete = false,
 
         entryPoints = {
-            BootstrapApplication.class
-        },
-
-        includes = {
-                AndroidModule.class
+                BootstrapApplication.class,
+                CarouselActivity.class,
+                BootstrapTimerActivity.class,
+                CheckInsListFragment.class,
+                NewsActivity.class,
+                NewsListFragment.class,
+                UserActivity.class,
+                UserListFragment.class
         }
+
 )
 public class BootstrapModule  {
 
@@ -34,4 +50,10 @@ Bus provideOttoBus() {
 
     }
 
+    @Provides
+    @Singleton
+    LogoutService provideLogoutService(final Context context, final AccountManager accountManager) {
+        return new LogoutService(context, accountManager);
+    }
+
 }

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

@@ -2,6 +2,7 @@
 package com.donnfelker.android.bootstrap;
 
 import android.accounts.AccountsException;
+import android.app.Activity;
 
 import com.donnfelker.android.bootstrap.authenticator.ApiKeyProvider;
 import com.donnfelker.android.bootstrap.core.BootstrapService;
@@ -27,7 +28,7 @@ public class BootstrapServiceProvider {
      * @throws IOException
      * @throws AccountsException
      */
-    public BootstrapService getService() throws IOException, AccountsException {
+    public BootstrapService getService(Activity activity) throws IOException, AccountsException {
         return new BootstrapService(keyProvider.getAuthKey(), userAgentProvider);
     }
 }

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

@@ -0,0 +1,16 @@
+package com.donnfelker.android.bootstrap;
+
+import dagger.Module;
+
+/**
+ * Add all the other modules to this one.
+ */
+@Module
+(
+    includes = {
+            AndroidModule.class,
+            BootstrapModule.class
+    }
+)
+public class RootModule {
+}

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

@@ -20,7 +20,6 @@
  */
 public class ApiKeyProvider {
 
-    @Inject private Activity activity;
     @Inject private AccountManager accountManager;
 
     /**
@@ -30,7 +29,7 @@ public class ApiKeyProvider {
      * @throws AccountsException
      * @throws IOException
      */
-    public String getAuthKey() throws AccountsException, 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);
 

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

@@ -11,18 +11,20 @@
 
 import javax.inject.Inject;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
 
-
-// TODO-dagger: Mark this a s singleton of some sort, maybe.
-// @ContextSingleton
+/**
+ * Class used for logging a user out.
+ */
 public class LogoutService {
 
-    @Inject protected Context context;
-    @Inject protected AccountManager accountManager;
-
+    protected Context context;
+    protected AccountManager accountManager;
 
+    @Inject
+    public LogoutService(Context context, AccountManager accountManager) {
+        this.context = context;
+        this.accountManager = accountManager;
+    }
 
     public void logout(final Runnable onSuccess) {
 

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

@@ -1,27 +1,26 @@
 package com.donnfelker.android.bootstrap.core;
 
-import android.app.Application;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.os.Build;
 import android.telephony.TelephonyManager;
 
+import com.donnfelker.android.bootstrap.BootstrapApplication;
 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;
 
 
 public class UserAgentProvider implements Provider<String> {
-    @Inject protected Application app;
+    @Inject protected ApplicationInfo appInfo;
     @Inject protected PackageInfo info;
     @Inject protected TelephonyManager telephonyManager;
+    @Inject protected ClassLoader classLoader;
 
     protected String userAgent;
 
@@ -44,13 +43,13 @@ public String get() {
                     );
 
                     final ArrayList<String> params = new ArrayList<String>();
-                    params.add( "preload=" + ((app.getApplicationInfo().flags& ApplicationInfo.FLAG_SYSTEM)==1) ); // Determine if this app was a preloaded app
+                    params.add( "preload=" + ((appInfo.flags& ApplicationInfo.FLAG_SYSTEM)==1) ); // Determine if this app was a preloaded app
                     params.add( "locale=" + Locale.getDefault() );
 
 
                     // http://stackoverflow.com/questions/2641111/where-is-android-os-systemproperties
                     try{
-                        final Class SystemProperties = app.getClassLoader().loadClass("android.os.SystemProperties");
+                        final Class SystemProperties = classLoader.loadClass("android.os.SystemProperties");
                         final Method get = SystemProperties.getMethod("get", String.class);
                         params.add( "clientidbase=" + get.invoke(SystemProperties, "ro.com.google.clientidbase"));
                     }catch( Exception ignored ){

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

@@ -11,16 +11,19 @@
 
 import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.donnfelker.android.bootstrap.core.CheckIn;
 import com.github.kevinsawicki.wishlist.SingleTypeAdapter;
 import javax.inject.Inject;
 
 import javax.inject.Inject;
+import java.util.Collections;
 import java.util.List;
 
 public class CheckInsListFragment extends ItemListFragment<CheckIn> {
 
     @Inject protected BootstrapServiceProvider serviceProvider;
+    @Inject protected LogoutService logoutService;
 
     @Override
     protected void configureList(Activity activity, ListView listView) {
@@ -34,6 +37,11 @@ protected void configureList(Activity activity, ListView listView) {
                         .inflate(R.layout.checkins_list_item_labels, null));
     }
 
+    @Override
+    LogoutService getLogoutService() {
+        return logoutService;
+    }
+
     @Override
     public void onDestroyView() {
         setListAdapter(null);
@@ -49,7 +57,12 @@ public Loader<List<CheckIn>> onCreateLoader(int id, Bundle args) {
             @Override
             public List<CheckIn> loadData() throws Exception {
                 try {
-                    return serviceProvider.getService().getCheckIns();
+                    if(getActivity() != null) {
+                        return serviceProvider.getService(getActivity()).getCheckIns();
+                    } else {
+                        return Collections.emptyList();
+                    }
+
                 } catch (OperationCanceledException e) {
                     Activity activity = getActivity();
                     if (activity != null)

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

@@ -1,7 +1,6 @@
 
 package com.donnfelker.android.bootstrap.ui;
 
-import android.accounts.AccountManager;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
@@ -22,18 +21,15 @@
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.R.id;
+import com.donnfelker.android.bootstrap.R.layout;
 import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.github.kevinsawicki.wishlist.SingleTypeAdapter;
 import com.github.kevinsawicki.wishlist.Toaster;
 import com.github.kevinsawicki.wishlist.ViewUtils;
-import com.donnfelker.android.bootstrap.R.id;
-import com.donnfelker.android.bootstrap.R.layout;
-import com.donnfelker.android.bootstrap.R.menu;
-import javax.inject.Inject;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Callable;
 
 
 
@@ -46,8 +42,6 @@
 public abstract class ItemListFragment<E> extends SherlockFragment
         implements LoaderCallbacks<List<E>> {
 
-    @Inject protected LogoutService logoutService;
-
     private static final String FORCE_REFRESH = "forceRefresh";
 
     /**
@@ -172,8 +166,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
+    abstract LogoutService getLogoutService();
+
     private void logout() {
-        logoutService.logout(new Runnable() {
+        getLogoutService().logout(new Runnable() {
             @Override
             public void run() {
                 // Calling a refresh will force the service to look for a logged in user