[n.debug] Refactor safe-for-ui and fix its interaction with on-ui

src/clojure/neko/debug.clj

@@ -20,6 +20,8 @@
   ([key]
    `(get all-activities ~key)))
 
+;;; Exception handling
+
 ;; This atom stores the last exception happened on the UI thread.
 ;;
 (def ^:private ui-exception (atom nil))
@@ -37,22 +39,20 @@
   "Returns an uncaught exception happened on UI thread."
   [] @ui-exception)
 
-(defmacro catch-all-exceptions [func]
+(defmacro safe-for-ui
+  "A conditional macro that will protect the application from crashing
+  if the code provided in `body` crashes on UI thread in the debug
+  build. If the build is a release one returns `body` in a `do`-form."
+  [& body]
   (if (:neko.init/release-build *compiler-options*)
-    `(~func)
-    `(try (~func)
-          (catch Throwable e#
-            (handle-exception-from-ui-thread e#)))))
+    `(do ~@body)
+    `(try ~@body
+          (catch Throwable e# (handle-exception-from-ui-thread e#)))))
 
 (defn safe-for-ui*
-  "Wraps the given function inside a try..catch block and notify user
-  using a Toast if an exception happens."
+  "Wraps the given zero-argument function in `safe-for-ui` call and returns it,
+  without executing."
   [f]
-  (catch-all-exceptions f))
+  (fn [] (safe-for-ui (f))))
+
 
-(defmacro safe-for-ui
-  "A conditional macro that will protect the application from crashing
-  if the code provided in `body` crashes on UI thread in the debug
-  build. If the build is a release one returns `body` as is."
-  [& body]
-  `(safe-for-ui* (fn [] ~@body)))

src/clojure/neko/threading.clj

@@ -28,19 +28,18 @@
   (identical? (Thread/currentThread)
               (.getThread ^Looper (Looper/getMainLooper))))
 
-(defn on-ui*
-  "Runs the given nullary function on the UI thread.  If this function is
-  called on the UI thread, it will evaluate immediately."
-  [f]
-  (if (on-ui-thread?)
-    (f)
-    (.post (Handler. (Looper/getMainLooper)) (fn [] (safe-for-ui (f))))))
-
 (defmacro on-ui
   "Runs the macro body on the UI thread.  If this macro is called on the UI
   thread, it will evaluate immediately."
   [& body]
-  `(on-ui* (fn [] ~@body)))
+  `(if (on-ui-thread?)
+     (safe-for-ui ~@body)
+     (.post (Handler. (Looper/getMainLooper)) (fn [] (safe-for-ui ~@body)))))
+
+(defn on-ui*
+  "Functional version of `on-ui`, runs the nullary function on the UI thread."
+  [f]
+  (on-ui (f)))
 
 (defn ^{:deprecated "3.1.0"} post*
   "Causes the function to be added to the message queue.  The function will