Fix MultiConnectionsFileTransfer.kt.

pengcheng.tan · pengcheng.tan · commit feea4e7ed3af · 2021-03-09T15:46:46.000+08:00
diff --git a/app/src/main/java/com/tans/tfiletransporter/net/filetransporter/MultiConnectionsFileTransfer.kt b/app/src/main/java/com/tans/tfiletransporter/net/filetransporter/MultiConnectionsFileTransfer.kt
@@ -80,7 +80,10 @@ class MultiConnectionsFileServer(
 
     private val finishCheckChannel = Channel<Unit>(1)
 
+    var sendingCoroutineScope: CoroutineScope? = null
+
     internal suspend fun start() = coroutineScope {
+        sendingCoroutineScope = this
         ssc.use {
             ssc.setOptionSuspend(StandardSocketOptions.SO_REUSEADDR, true)
             ssc.bindSuspend(InetSocketAddress(localAddress, MULTI_CONNECTIONS_FILES_TRANSFER_LISTEN_PORT), MULTI_CONNECTIONS_MAX)
@@ -107,7 +110,7 @@ class MultiConnectionsFileServer(
                         }
                     } else {
                         connectResult.exceptionOrNull()?.printStackTrace()
-                        if (progressLong.get() >= file.size || !isActive) {
+                        if (progressLong.get() >= file.size || !isActive || !ssc.isOpen) {
                             break
                         }
                     }
@@ -119,6 +122,7 @@ class MultiConnectionsFileServer(
     }
 
     suspend fun cancel() {
+        sendingCoroutineScope?.cancel("Canceled by user.")
         if (ssc.isOpen) ssc.close()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,10 @@ class MultiConnectionsFileServer(`
`80`	`80`
`81`	`81`	`private val finishCheckChannel = Channel<Unit>(1)`
`82`	`82`
	`83`	`+ var sendingCoroutineScope: CoroutineScope? = null`
	`84`	`+`
`83`	`85`	`internal suspend fun start() = coroutineScope {`
	`86`	`+ sendingCoroutineScope = this`
`84`	`87`	`ssc.use {`
`85`	`88`	`ssc.setOptionSuspend(StandardSocketOptions.SO_REUSEADDR, true)`
`86`	`89`	`ssc.bindSuspend(InetSocketAddress(localAddress, MULTI_CONNECTIONS_FILES_TRANSFER_LISTEN_PORT), MULTI_CONNECTIONS_MAX)`
`@@ -107,7 +110,7 @@ class MultiConnectionsFileServer(`
`107`	`110`	`}`
`108`	`111`	`} else {`
`109`	`112`	`connectResult.exceptionOrNull()?.printStackTrace()`
`110`		`- if (progressLong.get() >= file.size \|\| !isActive) {`
	`113`	`+ if (progressLong.get() >= file.size \|\| !isActive \|\| !ssc.isOpen) {`
`111`	`114`	`break`
`112`	`115`	`}`
`113`	`116`	`}`
`@@ -119,6 +122,7 @@ class MultiConnectionsFileServer(`
`119`	`122`	`}`
`120`	`123`
`121`	`124`	`suspend fun cancel() {`
	`125`	`+ sendingCoroutineScope?.cancel("Canceled by user.")`
`122`	`126`	`if (ssc.isOpen) ssc.close()`
`123`	`127`	`}`
`124`	`128`