diff --git a/navi-alfred/src/main/java/com/navi/alfred/AlfredManager.kt b/navi-alfred/src/main/java/com/navi/alfred/AlfredManager.kt index ee4f2a7..13a64e3 100644 --- a/navi-alfred/src/main/java/com/navi/alfred/AlfredManager.kt +++ b/navi-alfred/src/main/java/com/navi/alfred/AlfredManager.kt @@ -132,6 +132,8 @@ object AlfredManager { if (config.getEnableRecordingStatus().not()) { return } + screenShotTimer?.cancel() + screenShotTimer = Timer() if (!hasRecordingStarted) { checkDbBeforeStartRecording() config.setAlfredSessionId() @@ -151,8 +153,6 @@ object AlfredManager { setCurrentScreenName(screenName) currentModuleName = moduleName hasRecordingStarted = true - screenShotTimer?.cancel() - screenShotTimer = Timer() var bmpForCanvas: Pair? = null var bmpForThirdPartySdkScreen: Bitmap? = null if (moduleName == THIRD_PARTY_MODULE) { @@ -172,7 +172,7 @@ object AlfredManager { measureInflatedView(thirdPartyScreenView) thirdPartyScreenView .findViewById(R.id.tv_third_party_name) - .text = currentScreenName + .text = screenName bmpForThirdPartySdkScreen = thirdPartyScreenView?.let { captureScreenshotOfCustomView(it) @@ -192,7 +192,7 @@ object AlfredManager { captureScreen( view, context, - screenName = currentScreenName, + screenName = screenName, scope = coroutineScope, canvas = bmpForCanvas?.first, bmp = bmpForCanvas?.second, @@ -216,7 +216,7 @@ object AlfredManager { view, bottomSheetView, context, - currentScreenName, + screenName, bmpForCanvas?.first, rootBmp = bmpForCanvas?.second, moduleName = moduleName @@ -225,7 +225,7 @@ object AlfredManager { captureScreen( view, context, - screenName = currentScreenName, + screenName = screenName, scope = coroutineScope, canvas = bmpForCanvas?.first, bmp = bmpForCanvas?.second, diff --git a/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt b/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt index dc278d5..7062f12 100644 --- a/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt +++ b/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt @@ -200,7 +200,7 @@ internal suspend fun captureScreen( withContext(Dispatchers.Main) { val rootView = AlfredManager.sensitiveComposeRepository.getRootViewOfComposeScreen() - if (isMaskingEnabled(AlfredManager.currentScreenName)) { + if (isMaskingEnabled(screenName)) { try { if (rootView != null) { if (AlfredManager.sensitiveComposeRepository.getBlurSensitiveScreenStatus()) {