Fix resume issue

firemaples · Aug 20, 2023 · 09cfed5 · 09cfed5
1 parent 4c87c94
commit 09cfed5
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/main/src/main/java/tw/firemaples/onscreenocr/screenshot/ScreenExtractor.kt b/main/src/main/java/tw/firemaples/onscreenocr/screenshot/ScreenExtractor.kt
@@ -233,35 +233,42 @@ object ScreenExtractor {
     private suspend fun ImageReader.awaitForBitmap(screenSize: Point): Bitmap? =
         suspendCoroutine {
             var counter = 0
+            val resumed = AtomicBoolean(false)
             setOnImageAvailableListener({ reader ->
+                logger.info("onImageAvailable()")
+                if (resumed.get()){
+                    reader.setOnImageAvailableListener(null, null)
+                    return@setOnImageAvailableListener
+                }
                 var image: Image? = null
-                val resumed = AtomicBoolean(false)
                 try {
-                    logger.info("onImageAvailable()")
                     image = reader.acquireLatestImage()
                     val bitmap = image.decodeBitmap(screenSize)
                     if (!bitmap.isWholeBlack()) {
                         reader.setOnImageAvailableListener(null, null)
-                        if (!resumed.getAndSet(true)) {
-                            it.resume(bitmap)
-                        }
+                        if (resumed.getAndSet(true))
+                            return@setOnImageAvailableListener
+                        logger.info("Resume #1")
+                        it.resume(bitmap)
                     } else {
                         logger.info("Image is whole black, increase counter: $counter")
                         if (counter >= Constants.EXTRACT_SCREEN_MAX_RETRY) {
                             reader.setOnImageAvailableListener(null, null)
-                            if (!resumed.getAndSet(true)) {
-                                it.resume(null)
-                            }
+                            if (resumed.getAndSet(true))
+                                return@setOnImageAvailableListener
+                            logger.info("Resume #2")
+                            it.resume(null)
                         } else {
                             counter++
                         }
                     }
                 } catch (e: Throwable) {
-                    logger.warn(t = e)
-                    if (!resumed.getAndSet(true)) {
-                        reader.setOnImageAvailableListener(null, null)
-                        it.resumeWithException(e)
-                    }
+                    logger.warn("Error when acquire image", t = e)
+                    reader.setOnImageAvailableListener(null, null)
+                    if (resumed.getAndSet(true))
+                        return@setOnImageAvailableListener
+                    logger.info("Resume #3")
+                    it.resumeWithException(e)
                 } finally {
                     image?.close()
                 }