fix postOnMainThread.jobCondition, Boolean to Unit.Boolean

tonyjs · Jul 18, 2017 · 1a2fb4d · 1a2fb4d
1 parent 6a07945
commit 1a2fb4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/kotlin/com/tonyjs/hibiscus/ui/MainActivity.kt b/app/src/main/kotlin/com/tonyjs/hibiscus/ui/MainActivity.kt
@@ -183,7 +183,7 @@ class MainActivity : AppCompatActivity(), LifecycleRegistryOwner {
 
         messageViewModel.write(getString(R.string.desc_my_nickname, nickname()), Message.From.HUMAN)
 
-        postToMainThread(runCondition = isAlive(lifecycle), delayMillis = 1000L) {
+        postToMainThread(runCondition = { isAlive(lifecycle) }, delayMillis = 1000L) {
             messageViewModel.write(getString(R.string.ok_wait_a_minute), Message.From.BOT)
         }
 
@@ -201,7 +201,7 @@ class MainActivity : AppCompatActivity(), LifecycleRegistryOwner {
                     LOG.e(TAG, error)
                     messageViewModel.write(getString(R.string.error_on_sign_in), Message.From.BOT)
 
-                    postToMainThread(runCondition = isAlive(lifecycle), delayMillis = 1000L) {
+                    postToMainThread(runCondition = { isAlive(lifecycle) }, delayMillis = 1000L) {
                         navigationViewModel.moveTo(NavigationTo.SIGN_IN)
                     }
                 }).apply { addDisposable(this) }
@@ -212,7 +212,7 @@ class MainActivity : AppCompatActivity(), LifecycleRegistryOwner {
 
         messageViewModel.write(getString(R.string.welcome_user, user.nickname), Message.From.BOT)
 
-        postToMainThread(runCondition = isAlive(lifecycle), delayMillis = 1000L) {
+        postToMainThread(runCondition = { isAlive(lifecycle) }, delayMillis = 1000L) {
             navigationViewModel.moveTo(NavigationTo.GUIDE_TO_CREATE_POST)
         }
     }
@@ -244,7 +244,7 @@ class MainActivity : AppCompatActivity(), LifecycleRegistryOwner {
                 .subscribe({
                     val delay = 1000L - (System.currentTimeMillis() - startTime)
 
-                    postToMainThread(runCondition = isAlive(lifecycle), delayMillis = delay) {
+                    postToMainThread(runCondition = { isAlive(lifecycle) }, delayMillis = delay) {
                         guideToNext(it)
                     }
                 }, { error ->
@@ -284,7 +284,7 @@ class MainActivity : AppCompatActivity(), LifecycleRegistryOwner {
 
     private fun addFragment(fragment: Fragment, tag: String, toBackStack: Boolean = false,
                             transition: Int = FragmentTransaction.TRANSIT_FRAGMENT_OPEN) {
-        postToMainThread(runCondition = isAlive(lifecycle)) {
+        postToMainThread(runCondition = { isAlive(lifecycle) }) {
             supportFragmentManager.findFragmentByTag(tag)?.let { return@postToMainThread }
 
             val ft = supportFragmentManager.beginTransaction()

diff --git a/app/src/main/kotlin/com/tonyjs/hibiscus/ui/Utils.kt b/app/src/main/kotlin/com/tonyjs/hibiscus/ui/Utils.kt
@@ -12,10 +12,10 @@ import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import io.reactivex.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit
 
-inline fun postToMainThread(runCondition: Boolean = true, delayMillis: Long = 0L,
-                            crossinline job: () -> Unit) {
+fun postToMainThread(runCondition: () -> Boolean, delayMillis: Long = 0L,
+                     job: () -> Unit) {
     val withCondition = {
-        if (runCondition) {
+        if (runCondition.invoke()) {
             job()
         }
     }

diff --git a/app/src/main/kotlin/com/tonyjs/hibiscus/ui/post/create/CreatePostFragment.kt b/app/src/main/kotlin/com/tonyjs/hibiscus/ui/post/create/CreatePostFragment.kt
@@ -179,7 +179,7 @@ class CreatePostFragment : BaseFragment() {
     }
 
     private fun showPhotoList() {
-        postToMainThread(runCondition = isAlive(lifecycle)) {
+        postToMainThread(runCondition = { isAlive(lifecycle) }) {
             childFragmentManager.findFragmentByTag(PhotoListFragment.TAG)?.let {
                 (it as PhotoListFragment).dialog.show()
                 return@postToMainThread
@@ -190,7 +190,7 @@ class CreatePostFragment : BaseFragment() {
     }
 
     private fun hidePhotoList() {
-        postToMainThread(runCondition = isAlive(lifecycle)) {
+        postToMainThread(runCondition = { isAlive(lifecycle) }) {
             childFragmentManager.findFragmentByTag(PhotoListFragment.TAG)?.let {
                 (it as PhotoListFragment).dialog.hide()
             }