Abstract configuration of ExceptionHandler

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/ActivityRecorderActivity.java

@@ -124,9 +124,7 @@ public class ActivityRecorderActivity extends Activity {
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        Thread.setDefaultUncaughtExceptionHandler(
-                new ExceptionHandler("ActivityRecorder",
-                "http://chris.smith.name/android/upload", getVersionName(), getIMEI()));
+        Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
 
         bindService(new Intent(this, RecorderService.class), connection, BIND_AUTO_CREATE);
 
@@ -185,18 +183,6 @@ public class ActivityRecorderActivity extends Activity {
         }
     }
 
-    public String getVersionName() {
-        try {
-            return getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
-        } catch (NameNotFoundException ex) {
-            return "Unknown";
-        }
-    }
-
-    public String getIMEI() {
-        return ((TelephonyManager) getSystemService(TELEPHONY_SERVICE)).getDeviceId();
-    }
-
     /** {@inheritDoc} */
     @Override
     protected void onStart() {

code/Common/ExceptionHandler.java

@@ -22,6 +22,9 @@
 
 package uk.co.md87.android.common;
 
+import android.content.Context;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.telephony.TelephonyManager;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -57,6 +60,33 @@ public class ExceptionHandler implements UncaughtExceptionHandler {
         this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
     }
 
+    public ExceptionHandler(Context context) {
+        this(getAppName(context), "http://chris.smith.name/android/upload",
+                getVersionName(context), getIMEI(context));
+    }
+
+    private static String getVersionName(final Context context) {
+        try {
+            return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
+        } catch (NameNotFoundException ex) {
+            return "Unknown";
+        }
+    }
+
+    private static String getAppName(final Context context) {
+        try {
+            return context.getPackageManager().getApplicationLabel(context
+                    .getPackageManager().getPackageInfo(context.getPackageName(), 0)
+                    .applicationInfo).toString().replaceAll("[^A-Za-z]", "");
+        } catch (NameNotFoundException ex) {
+            return "Unknown";
+        }
+    }
+
+    private static String getIMEI(final Context context) {
+        return ((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
+    }
+
     public void uncaughtException(Thread t, Throwable e) {
         String timestamp = String.valueOf(System.currentTimeMillis());
         final Writer result = new StringWriter();

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/ContextAnalyserService.java

@@ -108,9 +108,7 @@ public class ContextAnalyserService extends Service {
     public void onCreate() {
         super.onCreate();
 
-        Thread.setDefaultUncaughtExceptionHandler(
-                new ExceptionHandler("ContextAnalyser",
-                "http://chris.smith.name/android/upload", getVersionName(), getIMEI()));
+        Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
 
         locationMonitor = new LocationMonitorFactory().getMonitor(this);
 
@@ -126,18 +124,6 @@ public class ContextAnalyserService extends Service {
 
         FlurryAgent.onStartSession(this, "MKB8YES3C6CFB86PXYXK");
     }
-
-    public String getVersionName() {
-        try {
-            return getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
-        } catch (NameNotFoundException ex) {
-            return "Unknown";
-        }
-    }
-
-    public String getIMEI() {
-        return ((TelephonyManager) getSystemService(TELEPHONY_SERVICE)).getDeviceId();
-    }
     
     public void poll() {
         handler.postDelayed(scheduleRunnable, POLLING_DELAY);

code/SensorLogger/src/uk/co/md87/android/sensorlogger/activities/IntroActivity.java

@@ -48,27 +48,13 @@ public class IntroActivity extends BoundActivity implements OnClickListener {
     public void onCreate(final Bundle icicle) {
         super.onCreate(icicle);
 
-        Thread.setDefaultUncaughtExceptionHandler(
-                new ExceptionHandler("SensorLogger",
-                "http://chris.smith.name/android/upload", getVersionName(), getIMEI()));
+        Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
 
         setContentView(R.layout.intro);
 
         ((Button) findViewById(R.id.introstart)).setOnClickListener(this);
     }
 
-    public String getVersionName() {
-        try {
-            return getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
-        } catch (NameNotFoundException ex) {
-            return "Unknown";
-        }
-    }
-
-    public String getIMEI() {
-        return ((TelephonyManager) getSystemService(TELEPHONY_SERVICE)).getDeviceId();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onClick(final View arg0) {