version: 1.2.1

yueeng · Nov 13, 2017 · b92f2ce · b92f2ce
1 parent 14621cd
commit b92f2ce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,14 +3,14 @@ apply plugin: "jp.leafytree.android-scala"
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    buildToolsVersion "26.0.3"
 
     defaultConfig {
         applicationId "io.github.yueeng.hacg"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 21
-        versionName "1.2.0"
+        versionCode 22
+        versionName "1.2.1"
         multiDexEnabled true
         testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
     }

diff --git a/app/src/main/scala/io/github/yueeng/hacg/Common.scala b/app/src/main/scala/io/github/yueeng/hacg/Common.scala
@@ -8,6 +8,7 @@ import java.util
 import java.util.Date
 import java.util.concurrent._
 
+import android.app
 import android.content.DialogInterface.OnDismissListener
 import android.content._
 import android.graphics.{Canvas, Paint, RectF}
@@ -377,15 +378,26 @@ object Common {
   object ContextHelper {
     val handler = new Handler(Looper.getMainLooper)
     val mainThread: Thread = Looper.getMainLooper.getThread
+
+    def ui(call: () => Unit): Unit = if (mainThread == Thread.currentThread()) call()
+    else handler.post(() => call())
   }
 
   class AsyncScalaContext[T <: AnyRef](weak: WeakReference[T]) {
     def ui(func: T => Unit): Boolean = weak.get match {
       case None => false
       case Some(ref) =>
-        if (ContextHelper.mainThread == Thread.currentThread()) func(ref)
-        else ContextHelper.handler.post(() => func(ref))
-        true
+        if (ref match {
+          case f: Fragment if !f.isAdded => false
+          case f: app.Fragment if !f.isAdded => false
+          case _ => true
+        }) try {
+          ContextHelper.ui(() => func(ref))
+          true
+        } catch {
+          case _: Throwable => false
+        }
+        else false
     }
   }