Prevent temporary leaks in HandlerDispatcher by properly handling

cbeyls · elizarov · commit e321394c3597 · 2018-10-22T22:28:29.000-07:00
cancellations in scheduleResumeAfterDelay() implementation
diff --git a/ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt b/ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt
@@ -120,9 +120,11 @@ internal class HandlerContext private constructor(
     }
 
     override fun scheduleResumeAfterDelay(timeMillis: Long, continuation: CancellableContinuation<Unit>) {
-        handler.postDelayed({
+        val block = Runnable {
             with(continuation) { resumeUndispatched(Unit) }
-        }, timeMillis.coerceAtMost(MAX_DELAY))
+        }
+        handler.postDelayed(block, timeMillis.coerceAtMost(MAX_DELAY))
+        continuation.invokeOnCancellation { handler.removeCallbacks(block) }
     }
 
     override fun invokeOnTimeout(timeMillis: Long, block: Runnable): DisposableHandle {

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,11 @@ internal class HandlerContext private constructor(`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`override fun scheduleResumeAfterDelay(timeMillis: Long, continuation: CancellableContinuation<Unit>) {`
`123`		`- handler.postDelayed({`
	`123`	`+ val block = Runnable {`
`124`	`124`	`with(continuation) { resumeUndispatched(Unit) }`
`125`		`- }, timeMillis.coerceAtMost(MAX_DELAY))`
	`125`	`+ }`
	`126`	`+ handler.postDelayed(block, timeMillis.coerceAtMost(MAX_DELAY))`
	`127`	`+ continuation.invokeOnCancellation { handler.removeCallbacks(block) }`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`override fun invokeOnTimeout(timeMillis: Long, block: Runnable): DisposableHandle {`