Initial work on some kind of sensible threading. TBC.

code/ContextHome/src/uk/co/md87/android/contexthome/ContextHome.java

@@ -24,6 +24,7 @@ package uk.co.md87.android.contexthome;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.LinearLayout;
 import java.util.Arrays;
@@ -39,9 +40,6 @@ import uk.co.md87.android.contexthome.modules.*;
  */
 public class ContextHome extends Activity {
 
-    private static final LayoutParams MODULE_PARAMS
-            = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
-
     private LinearLayout layout, fixedLayout;
 
     private ContextType[] contexts;
@@ -81,12 +79,20 @@ public class ContextHome extends Activity {
         fixedLayout.removeAllViews();
         layout.removeAllViews();
 
+        long start, end;
+
         for (Module module : fixedModules) {
-            fixedLayout.addView(module.getView(this, 1), MODULE_PARAMS);
+            start = System.currentTimeMillis();
+            module.addViews(fixedLayout, this, 1);
+            end = System.currentTimeMillis();
+            Log.v("ContextHome", module.getClass().getSimpleName() + ": " + (end - start));
         }
 
         for (Module module : modules) {
-            layout.addView(module.getView(this, 10), MODULE_PARAMS);
+            start = System.currentTimeMillis();
+            module.addViews(layout, this, 10);
+            end = System.currentTimeMillis();
+            Log.v("ContextHome", module.getClass().getSimpleName() + ": " + (end - start));
         }
     }
 

code/ContextHome/src/uk/co/md87/android/contexthome/Module.java

@@ -23,7 +23,9 @@
 package uk.co.md87.android.contexthome;
 
 import android.content.Context;
+import android.text.Layout;
 import android.view.View;
+import android.view.ViewGroup;
 
 import java.util.Map;
 
@@ -66,6 +68,6 @@ public abstract class Module {
         helper.registerAction(module, params);
     }
 
-    public abstract View getView(final Context context, final int weight);
+    public abstract void addViews(final ViewGroup parent, final Context context, final int weight);
 
 }

code/ContextHome/src/uk/co/md87/android/contexthome/modules/AppsModule.java

@@ -27,9 +27,12 @@ import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Handler;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
@@ -54,8 +57,13 @@ public class AppsModule extends Module implements Comparator<ResolveInfo> {
 
     /** {@inheritDoc} */
     @Override
-    public View getView(final Context context, final int weight) {
+    public void addViews(final ViewGroup parent, final Context context, final int weight) {
         final View view = View.inflate(context, R.layout.scroller, null);
+        final Handler handler = new Handler();
+
+        new Thread(new Runnable() {
+
+            public void run() {
         final LinearLayout layout = (LinearLayout) view.findViewById(R.id.content);
         final PackageManager pm = context.getPackageManager();
         final Intent intent = new Intent(Intent.ACTION_MAIN);
@@ -75,7 +83,9 @@ public class AppsModule extends Module implements Comparator<ResolveInfo> {
         intent.addCategory(Intent.CATEGORY_LAUNCHER);
 
         final List<ResolveInfo> infos = pm.queryIntentActivities(intent, 0);
-        Collections.sort(infos, this);
+        Collections.sort(infos, AppsModule.this);
+
+        final List<View> views = new ArrayList<View>(infos.size());
         
         for (ResolveInfo res : infos) {
             final ImageView image = new ImageView(context);
@@ -86,10 +96,21 @@ public class AppsModule extends Module implements Comparator<ResolveInfo> {
             image.setOnClickListener(listener);
             image.setPadding(2, 2, 2, 2);
             image.setBackgroundResource(R.drawable.grid_selector);
-            layout.addView(image, 52, 52);
+            views.add(image);
+        }
+
+        handler.post(new Runnable() {
+
+                    public void run() {
+                        for (View myView : views) {
+                            layout.addView(myView, 52, 52);
+                        }
+                    }
+                });
         }
+        }).start();
 
-        return view;
+        parent.addView(view);
     }
 
     public Map<String, String> getMap(final ResolveInfo info) {

code/ContextHome/src/uk/co/md87/android/contexthome/modules/ContactsModule.java

@@ -27,9 +27,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Handler;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Photos;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import java.util.ArrayList;
@@ -56,7 +58,7 @@ public class ContactsModule extends Module implements Comparator<Long> {
 
     /** {@inheritDoc} */
     @Override
-    public View getView(final Context context, final int weight) {
+    public void addViews(final ViewGroup parent, final Context context, final int weight) {
         final View view = View.inflate(context, R.layout.scroller, null);
         final LinearLayout layout = (LinearLayout) view.findViewById(R.id.content);
 
@@ -72,25 +74,42 @@ public class ContactsModule extends Module implements Comparator<Long> {
             }
         };
 
-        final Cursor cursor = context.getContentResolver().query(Photos.CONTENT_URI,
-                new String[] { "person" }, "exists_on_server != 0", null, null);
-
-        final int column = cursor.getColumnIndex("person");
-        final List<Long> hits = new ArrayList<Long>(cursor.getCount());
-        if (cursor.moveToFirst()) {
-            int i = 0;
-            do {
-                hits.add(cursor.getLong(column));
-            } while (cursor.moveToNext());
-        }
-        
-        Collections.sort(hits, this);
-
-        for (Long id : hits) {
-            layout.addView(getView(context, listener, id), 52, 52);
-        }
-
-        return view;
+        final Handler handler = new Handler();
+
+        new Thread(new Runnable() {
+
+            public void run() {
+                final Cursor cursor = context.getContentResolver().query(Photos.CONTENT_URI,
+                        new String[] { "person" }, "exists_on_server != 0", null, null);
+
+                final int column = cursor.getColumnIndex("person");
+                final List<Long> hits = new ArrayList<Long>(cursor.getCount());
+                if (cursor.moveToFirst()) {
+                    do {
+                        hits.add(cursor.getLong(column));
+                    } while (cursor.moveToNext());
+                }
+
+                Collections.sort(hits, ContactsModule.this);
+
+                final List<View> views = new ArrayList<View>(hits.size());
+
+                for (Long id : hits) {
+                    views.add(getView(context, listener, id));
+                }
+
+                handler.post(new Runnable() {
+
+                    public void run() {
+                        for (View myView : views) {
+                            layout.addView(myView, 52, 52);
+                        }
+                    }
+                });
+            }
+        }).start();
+
+        parent.addView(view);
     }
 
     private final View getView(final Context context, View.OnClickListener listener,

code/ContextHome/src/uk/co/md87/android/contexthome/modules/Email.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2009-2010 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.android.contexthome.modules;
+
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Contacts;
+import android.provider.Contacts.People;
+import android.text.Html;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import uk.co.md87.android.contexthome.R;
+
+public class Email implements Runnable {
+
+    private String body;
+    private String address;
+    private int count;
+    private final long convId;
+    private final Handler handler;
+    private final Context context;
+    private final View view;
+    private long id = -1;
+
+    public Email(Handler handler, Context context, long convId, View view) {
+        this.handler = handler;
+        this.convId = convId;
+        this.context = context;
+        this.view = view;
+        
+        new Thread(this).start(); // Ick!
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public View getView() {
+        return view;
+    }
+
+    public void run() {
+        final Uri inboxUri = Uri.parse("content://gmail-ls/"
+            + "conversations/" + context.getSharedPreferences("email",
+            Context.MODE_WORLD_READABLE).getString("account", "chris87@gmail.com"));
+
+       final Uri uri = inboxUri.buildUpon().appendEncodedPath(String.valueOf(convId)
+                    + "/messages").build();
+
+       final Cursor messageCursor = context.getContentResolver().query(uri,
+            new String[] { "fromAddress", "subject", "messageId" }, null, null, null);
+
+        while (messageCursor.getExtras().getString("status").equals("LOADING")) {
+            messageCursor.requery();
+            Thread.yield();
+        }
+
+        if (messageCursor.moveToFirst()) {
+            final int subjectIndex = messageCursor.getColumnIndex("subject");
+            final int addressIndex = messageCursor.getColumnIndex("fromAddress");
+
+            body = messageCursor.getString(subjectIndex);
+            address = messageCursor.getString(addressIndex);
+            count = messageCursor.getCount();
+        }
+
+        messageCursor.close();
+
+        final Uri contactUri = Uri.parse("content://contacts/contact_methods");
+
+        final String name = address.replaceAll("^.*\"(.*?)\".*$", "$1")
+                .replaceAll("(.*), (.*)", "$2 $1");
+        final String email = address.replaceAll("^.*<(.*?)>.*$", "$1");
+
+        final Cursor cursor = context.getContentResolver().query(contactUri,
+                new String[] { "person", "name" }, "data LIKE ?", new String[] { email }, null);
+
+        final TextView title = (TextView) view.findViewById(R.id.title);
+        final ImageView image = (ImageView) view.findViewById(R.id.image);
+
+        if (cursor.moveToFirst()) {
+            final Uri personUri = ContentUris.withAppendedId(People.CONTENT_URI,
+                    cursor.getLong(cursor.getColumnIndex("person")));
+            setId(cursor.getLong(cursor.getColumnIndex("person")));
+            final String sender = cursor.getString(cursor.getColumnIndex("name"));
+            handler.post(new Runnable() {
+
+                public void run() {
+                    title.setText(Html.fromHtml("<b>" + sender + "</b> (" + count + ")"));
+                    image.setImageBitmap(Contacts.People.loadContactPhoto(context,
+                        personUri, R.drawable.blank, null));
+                }
+            });
+        } else {
+            handler.post(new Runnable() {
+
+                public void run() {
+                    title.setText(Html.fromHtml("<b>" + (name.length() == 0 ? email : name)
+                            + "</b> (" + getCount() + ")"));
+                }
+            });
+        }
+
+        cursor.close();
+
+        final TextView body = (TextView) view.findViewById(R.id.body);
+
+        handler.post(new Runnable() {
+
+            public void run() {
+                body.setText(getBody());
+            }
+        });
+    }
+}

code/ContextHome/src/uk/co/md87/android/contexthome/modules/EmailModule.java

@@ -22,23 +22,20 @@
 
 package uk.co.md87.android.contexthome.modules;
 
-import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
-import android.provider.Contacts;
-import android.provider.Contacts.People;
-import android.text.Html;
-import android.util.Log;
+import android.os.Handler;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
+import android.view.ViewGroup;
 import android.widget.LinearLayout.LayoutParams;
-import android.widget.TextView;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import uk.co.md87.android.contexthome.DataHelper;
 
 import uk.co.md87.android.contexthome.Module;
@@ -49,7 +46,7 @@ import uk.co.md87.android.contexthome.R;
  *
  * @author chris
  */
-public class EmailModule extends Module {
+public class EmailModule extends Module implements Comparator<Email> {
 
     public EmailModule(DataHelper helper) {
         super(helper);
@@ -57,10 +54,12 @@ public class EmailModule extends Module {
 
     /** {@inheritDoc} */
     @Override
-    public View getView(final Context context, final int weight) {
-        final LinearLayout layout = new LinearLayout(context);
-        layout.setOrientation(LinearLayout.VERTICAL);
+    public void addViews(final ViewGroup parent, final Context context, final int weight) {
+        final Handler handler = new Handler();
 
+        new Thread(new Runnable() {
+
+            public void run() {
         final Uri inboxUri = Uri.parse("content://gmail-ls/"
             + "conversations/" + context.getSharedPreferences("email",
             Context.MODE_WORLD_READABLE).getString("account", "chris87@gmail.com"));
@@ -68,103 +67,72 @@ public class EmailModule extends Module {
         final Cursor cursor = context.getContentResolver().query(inboxUri,
                 new String[] { "conversation_id" }, null, null, null);
 
+        while (cursor.getExtras().getString("status").equals("LOADING")) {
+            cursor.requery();
+            Thread.yield();
+        }
+
         final int convIdIndex = cursor.getColumnIndex("conversation_id");
 
         final LayoutParams params = new LayoutParams(LayoutParams.FILL_PARENT,
                 LayoutParams.WRAP_CONTENT);
         params.weight = 1;
 
-        final List<Object[]> messages = new ArrayList<Object[]>(weight);
-        final List<Long> convIds = new ArrayList<Long>();
+        final List<Email> messages = new ArrayList<Email>(weight);
 
         if (cursor.moveToFirst()) {
             do {
-                convIds.add(cursor.getLong(convIdIndex));
-            } while (cursor.moveToNext());
-        }
+                final View view = View.inflate(context, R.layout.titledimage, null);
+                view.setClickable(true);
+                view.setFocusable(true);
+                view.setOnClickListener(new View.OnClickListener() {
 
-        cursor.close();
+                    public void onClick(View arg0) {
+                        final Intent intent = new Intent();
+                        intent.setClassName("com.google.android.gm", "com.google.android.gm.ConversationListActivity");
+                        context.startActivity(intent);
 
-        Log.e("!!!!!", convIds.toString());
+                        recordAction(getMap((Email) arg0.getTag()));
+                    }
+                });
 
-        for (Long convId : convIds) {
-            final Uri uri = inboxUri.buildUpon().appendEncodedPath(String.valueOf(convId)
-                    + "/messages").build();
+                final Email message = new Email(handler, context,
+                        cursor.getLong(convIdIndex), view);
+                view.setTag(message);
 
-            final Cursor messageCursor = context.getContentResolver().query(uri,
-                new String[] { "fromAddress", "subject", "messageId" }, null, null, null);
-
-            while (messageCursor.getExtras().getString("status").equals("LOADING")) {
-                messageCursor.requery();
-                Thread.yield();
-            }
-
-            if (messageCursor.moveToFirst()) {
-                final int subjectIndex = messageCursor.getColumnIndex("subject");
-                final int addressIndex = messageCursor.getColumnIndex("fromAddress");
+                messages.add(message);
+            } while (cursor.moveToNext());
+        }
 
-                final String body = messageCursor.getString(subjectIndex);
-                final String address = messageCursor.getString(addressIndex);
-                final int count = messageCursor.getCount();
+        cursor.close();
 
-                messages.add(new Object[] { body, address, count });
-            }
+        Collections.sort(messages, EmailModule.this);
 
-            messageCursor.close();
-        }
+        handler.post(new Runnable() {
 
-        for (Object[] message : messages) {
-            layout.addView(getView(context, (String) message[0],
-                    (String) message[1], (Integer) message[2]), params);
+                    public void run() {
+                                for (Email message : messages) {
+            parent.addView(message.getView(), params);
         }
-
-        return layout;
+                    }
+                });
+                    }
+        }).start();
     }
 
-    private View getView(final Context context, final String text, final String address,
-            final int count) {
-        final View view = View.inflate(context, R.layout.titledimage, null);
-        view.setClickable(true);
-        view.setFocusable(true);
-        view.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View arg0) {
-                final Intent intent = new Intent();
-                intent.setClassName("com.google.android.gm", "com.google.android.gm.ConversationListActivity");
-                context.startActivity(intent);
-            }
-        });
-
-        final Uri contactUri = Uri.parse("content://contacts/contact_methods");
-
-        final String name = address.replaceAll("^.*\"(.*?)\".*$", "$1")
-                .replaceAll("(.*), (.*)", "$2 $1");
-        final String email = address.replaceAll("^.*<(.*?)>.*$", "$1");
-
-        final Cursor cursor = context.getContentResolver().query(contactUri,
-                new String[] { "person", "name" }, "data LIKE ?", new String[] { email }, null);
-
-        final TextView title = (TextView) view.findViewById(R.id.title);
-        final ImageView image = (ImageView) view.findViewById(R.id.image);
-
-        if (cursor.moveToFirst()) {
-            title.setText(Html.fromHtml("<b>" + cursor.getString(cursor
-                    .getColumnIndex("name")) + "</b> (" + count + ")"));
-            Uri uri = ContentUris.withAppendedId(People.CONTENT_URI,
-                    cursor.getLong(cursor.getColumnIndex("person")));
-            image.setImageBitmap(Contacts.People.loadContactPhoto(context,
-                    uri, R.drawable.blank, null));
-        } else {
-            title.setText(Html.fromHtml("<b>" + (name.length() == 0 ? email : name) + "</b> ("
-                    + count + ")"));
+    public Map<String, String> getMap(final Email email) {
+        final Map<String, String> params = new HashMap<String, String>();
+        if (email.getId() >= 0) {
+            params.put("contactid", String.valueOf(email.getId()));
         }
 
-        cursor.close();
+        params.put("contactemail", email.getAddress());
 
-        final TextView body = (TextView) view.findViewById(R.id.body);
-        body.setText(text);
+        return params;
+    }
 
-        return view;
+    public int compare(final Email arg0, final Email arg1) {
+        return getScore(getMap(arg1)) - getScore(getMap(arg0));
     }
 
 }

code/ContextHome/src/uk/co/md87/android/contexthome/modules/SmsModule.java

@@ -27,6 +27,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Handler;
 import android.provider.Contacts;
 import android.provider.Contacts.People;
 import android.text.Html;
@@ -36,6 +37,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
+import java.util.ArrayList;
+import java.util.List;
 import uk.co.md87.android.contexthome.DataHelper;
 import uk.co.md87.android.contexthome.Module;
 import uk.co.md87.android.contexthome.R;
@@ -55,10 +58,12 @@ public class SmsModule extends Module {
 
     /** {@inheritDoc} */
     @Override
-    public View getView(final Context context, final int weight) {
-        final LinearLayout layout = new LinearLayout(context);
-        layout.setOrientation(LinearLayout.VERTICAL);
+    public void addViews(final ViewGroup parent, final Context context, final int weight) {
+        final Handler handler = new Handler();
 
+        new Thread(new Runnable() {
+
+            public void run() {
         final Cursor cursor = context.getContentResolver().query(INBOX_URI,
                 new String[] { "thread_id", "date", "body", "address" }, null, null, "date DESC");
         final int idIndex = cursor.getColumnIndex("thread_id");
@@ -69,23 +74,30 @@ public class SmsModule extends Module {
                 LayoutParams.WRAP_CONTENT);
         params.weight = 1;
 
+        final List<View> views = new ArrayList<View>(weight);
         boolean success = cursor.moveToFirst();
         for (int i = 0; i < weight && success; i++) {
             final String body = cursor.getString(bodyIndex);
             final String address = cursor.getString(addressIndex);
 
-            layout.addView(getView(context, layout, body, address, cursor.getLong(idIndex)),
-                    params);
+            final View view = getView(context, body, address, cursor.getLong(idIndex));
+
+        handler.post(new Runnable() {
+
+                    public void run() {
+                        parent.addView(view);
+                    }
+                });
 
             success = cursor.moveToNext();
         }
         cursor.close();
-        
-
-        return layout;
+       
+                    }
+        }).start();
     }
 
-    private View getView(final Context context, ViewGroup layout, String text,
+    private View getView(final Context context, String text,
             String address, final long threadId) {
         final View view = View.inflate(context, R.layout.titledimage, null);
         view.setClickable(true);