From 98fb6d8efbcb150fb7764d45ba2aa8e807583afa Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 19 Feb 2014 19:55:22 -0800
Subject: Fix crash from sync adapter

---
 .../daneren2005/dsub/util/BackgroundTask.java      | 43 ++++++++++++++--------
 1 file changed, 27 insertions(+), 16 deletions(-)

(limited to 'src/github/daneren2005')

diff --git a/src/github/daneren2005/dsub/util/BackgroundTask.java b/src/github/daneren2005/dsub/util/BackgroundTask.java
index 569f1164..b9fe212f 100644
--- a/src/github/daneren2005/dsub/util/BackgroundTask.java
+++ b/src/github/daneren2005/dsub/util/BackgroundTask.java
@@ -50,7 +50,14 @@ public abstract class BackgroundTask<T> implements ProgressListener {
 	private static final int DEFAULT_CONCURRENCY = 5;
 	private static final Collection<Thread> threads = Collections.synchronizedCollection(new ArrayList<Thread>());
 	protected static final BlockingQueue<BackgroundTask.Task> queue = new LinkedBlockingQueue<BackgroundTask.Task>(10);
-	private static final Handler handler = new Handler();
+	private static Handler handler = null;
+	static {
+		try {
+			handler = new Handler();
+		} catch(Exception e) {
+			// Not called from main thread
+		}
+	}
 
     public BackgroundTask(Context context) {
         this.context = context;
@@ -153,12 +160,14 @@ public abstract class BackgroundTask<T> implements ProgressListener {
 					return;
 				}
 
-				handler.post(new Runnable() {
-					@Override
-					public void run() {
-						onDone(result);
-					}
-				});
+				if(handler != null) {
+					handler.post(new Runnable() {
+						@Override
+						public void run() {
+							onDone(result);
+						}
+					});
+				}
 			} catch(InterruptedException interrupt) {
 				if(taskStart.get()) {
 					// Don't exit root thread if task cancelled
@@ -169,16 +178,18 @@ public abstract class BackgroundTask<T> implements ProgressListener {
 					return;
 				}
 
-				handler.post(new Runnable() {
-					@Override
-					public void run() {
-						try {
-							onError(t);
-						} catch(Exception e) {
-							// Don't care
+				if(handler != null) {
+					handler.post(new Runnable() {
+						@Override
+						public void run() {
+							try {
+								onError(t);
+							} catch(Exception e) {
+								// Don't care
+							}
 						}
-					}
-				});
+					});
+				}
 			}
 		}
 
-- 
cgit v1.2.3