Add missing awaitClose

Damiano Giusti · Damiano Giusti · commit 565b2ada2a0b · 2020-03-27T14:59:06.000+01:00
diff --git a/library/src/main/java/com/molo17/couchbase/lite/DatabaseExtensions.kt b/library/src/main/java/com/molo17/couchbase/lite/DatabaseExtensions.kt
@@ -40,7 +40,7 @@ fun Database.changesFlow(): Flow<DatabaseChange> = callbackFlow {
  */
 fun Database.documentChangesFlow(documentId: String): Flow<DocumentChange> = callbackFlow {
     val token = addDocumentChangeListener(documentId) { change -> offer(change) }
-    removeChangeListener(token)
+    awaitClose { removeChangeListener(token) }
 }
 
 /**
diff --git a/library/src/main/java/com/molo17/couchbase/lite/QueryExtensions.kt b/library/src/main/java/com/molo17/couchbase/lite/QueryExtensions.kt
@@ -68,7 +68,7 @@ private fun Query.asQueryFlow(): Flow<QueryChange> = callbackFlow {
             throw queryChange.error
         }
     }
-    awaitClose { removeChangeListener(token) }
     // Run the query.
     execute()
+    awaitClose { removeChangeListener(token) }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ fun Database.changesFlow(): Flow<DatabaseChange> = callbackFlow {`
`40`	`40`	`*/`
`41`	`41`	`fun Database.documentChangesFlow(documentId: String): Flow<DocumentChange> = callbackFlow {`
`42`	`42`	`val token = addDocumentChangeListener(documentId) { change -> offer(change) }`
`43`		`- removeChangeListener(token)`
	`43`	`+ awaitClose { removeChangeListener(token) }`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private fun Query.asQueryFlow(): Flow<QueryChange> = callbackFlow {`
`68`	`68`	`throw queryChange.error`
`69`	`69`	`}`
`70`	`70`	`}`
`71`		`- awaitClose { removeChangeListener(token) }`
`72`	`71`	`// Run the query.`
`73`	`72`	`execute()`
	`73`	`+ awaitClose { removeChangeListener(token) }`
`74`	`74`	`}`