2 files changed, 20 insertions, 16 deletions

diff --git a/main/src/cgeo/geocaching/utils/Log.java b/main/src/cgeo/geocaching/utils/Log.java
index f338a8e..2f51e42 100644
--- a/main/src/cgeo/geocaching/utils/Log.java
+++ b/main/src/cgeo/geocaching/utils/Log.java
@@ -43,56 +43,60 @@ public final class Log {
         Log.isDebug = isDebug;
     }
 
+    private static String addThreadInfo(final String msg) {
+        return new StringBuilder("[").append(Thread.currentThread().getName()).append("] ").append(msg).toString();
+    }
+
     public static void v(final String msg) {
         if (isDebug) {
-            android.util.Log.v(TAG, msg);
+            android.util.Log.v(TAG, addThreadInfo(msg));
         }
     }
 
     public static void v(final String msg, final Throwable t) {
         if (isDebug) {
-            android.util.Log.v(TAG, msg, t);
+            android.util.Log.v(TAG, addThreadInfo(msg), t);
         }
     }
 
     public static void d(final String msg) {
         if (isDebug) {
-            android.util.Log.d(TAG, msg);
+            android.util.Log.d(TAG, addThreadInfo(msg));
         }
     }
 
     public static void d(final String msg, final Throwable t) {
         if (isDebug) {
-            android.util.Log.d(TAG, msg, t);
+            android.util.Log.d(TAG, addThreadInfo(msg), t);
         }
     }
 
     public static void i(final String msg) {
         if (isDebug) {
-            android.util.Log.i(TAG, msg);
+            android.util.Log.i(TAG, addThreadInfo(msg));
         }
     }
 
     public static void i(final String msg, final Throwable t) {
         if (isDebug) {
-            android.util.Log.i(TAG, msg, t);
+            android.util.Log.i(TAG, addThreadInfo(msg), t);
         }
     }
 
     public static void w(final String msg) {
-        android.util.Log.w(TAG, msg);
+        android.util.Log.w(TAG, addThreadInfo(msg));
     }
 
     public static void w(final String msg, final Throwable t) {
-        android.util.Log.w(TAG, msg, t);
+        android.util.Log.w(TAG, addThreadInfo(msg), t);
     }
 
     public static void e(final String msg) {
-        android.util.Log.e(TAG, msg);
+        android.util.Log.e(TAG, addThreadInfo(msg));
     }
 
     public static void e(final String msg, final Throwable t) {
-        android.util.Log.e(TAG, msg, t);
+        android.util.Log.e(TAG, addThreadInfo(msg), t);
     }
 
     /**
@@ -116,7 +120,7 @@ public final class Log {
         Writer writer = null;
         try {
             writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file, true), CharEncoding.UTF_8));
-            writer.write(msg);
+            writer.write(addThreadInfo(msg));
         } catch (final IOException e) {
             Log.e("logToFile: cannot write to " + file, e);
         } finally {
diff --git a/main/src/cgeo/geocaching/utils/RxUtils.java b/main/src/cgeo/geocaching/utils/RxUtils.java
index b8e9c6e..26b419c 100644
--- a/main/src/cgeo/geocaching/utils/RxUtils.java
+++ b/main/src/cgeo/geocaching/utils/RxUtils.java
@@ -11,6 +11,7 @@ import rx.functions.Action0;
 import rx.functions.Action1;
 import rx.functions.Func0;
 import rx.functions.Func1;
+import rx.internal.util.RxThreadFactory;
 import rx.observables.BlockingObservable;
 import rx.observers.Subscribers;
 import rx.schedulers.Schedulers;
@@ -25,8 +26,7 @@ import android.os.Process;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -39,12 +39,12 @@ public class RxUtils {
 
     public final static Scheduler computationScheduler = Schedulers.computation();
 
-    public static final Scheduler networkScheduler = Schedulers.from(new ThreadPoolExecutor(10, 10, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>()));
+    public static final Scheduler networkScheduler = Schedulers.from(Executors.newFixedThreadPool(10, new RxThreadFactory("network-")));
 
-    public static final Scheduler refreshScheduler = Schedulers.from(new ThreadPoolExecutor(3, 3, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>()));
+    public static final Scheduler refreshScheduler = Schedulers.from(Executors.newFixedThreadPool(3, new RxThreadFactory("refresh-")));
 
     private static final HandlerThread looperCallbacksThread =
-            new HandlerThread("Looper callbacks thread", Process.THREAD_PRIORITY_DEFAULT);
+            new HandlerThread("looper callbacks", Process.THREAD_PRIORITY_DEFAULT);
 
     static {
         looperCallbacksThread.start();