From 6570929608af1c02fa91a011e0a2fb7901418e2c Mon Sep 17 00:00:00 2001 From: lunaticbum Date: Mon, 16 Nov 2026 11:21:45 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20Task=2010=20=EC=99=84=EB=A3=8C=20-=20Pla?= =?UTF-8?q?yerActivity=20lifecycleScope=20=EC=A0=84=ED=99=98=20=EB=B0=8F?= =?UTF-8?q?=20Surface=20NPE=20=EB=B0=A9=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PlayerActivity.kt: * 비관리 CoroutineScope(Dispatchers.Main/IO).launch 5곳(uiUpdateJob, leftLongPressJob, downloadSubtitle, subtitleSyncJob, translateSubtitles)을 lifecycleScope.launch로 전환하여 Activity 종료 시 자동 취소 보장 * rebootEngine() 내 onPreparedListener에서 isDestroyed/isFinishing 체크 및 videoTextureView.surfaceTexture!! -> safe let 전환으로 NPE 방지 - TODO.md: 3-4 항목 완료 처리 - 검증: ./gradlew :app:compileDebugKotlin 빌드 성공 확인 (3s) --- TODO.md | 2 +- .../lunatic/launcher/player/PlayerActivity.kt | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/TODO.md b/TODO.md index d9b3d6fa..a70cce6c 100644 --- a/TODO.md +++ b/TODO.md @@ -106,7 +106,7 @@ - `app/src/main/kotlin/bums/lunatic/launcher/workers/TaskAggregator.kt:16-55` — `CoroutineScope(Dispatchers.IO).launch` 내부에 `try-catch`가 없어 `AppInfoGetter`/`ContactInfoGetter` 또는 `realm.write` 실패 시 조용히 실패하거나 앱 크래시 유발. - **작업**: `TaskAggregator`에 `try-catch` 및 실패 로깅 추가, 메인 스레드에서의 `writeBlocking` 호출 여부 점검 후 비동기 `write`로 전환. -- [ ] **3-4. `PlayerActivity` `Surface` null 단언(`!!`) 및 `rebootEngine` 동시성 방어** +- [x] **3-4. `PlayerActivity` `Surface` null 단언(`!!`) 및 `rebootEngine` 동시성 방어** - `app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt:78-80` — `rebootEngine` 콜백에서 `Surface(videoTextureView.surfaceTexture!!)` 사용 시, 비동기 준비 완료 시점에 `TextureView`가 이미 해제(`surfaceTexture == null`)되었으면 `NullPointerException` 발생. - **작업**: `videoTextureView.surfaceTexture?.let { nativePlayer?.play(Surface(it)) }`로 null-safe 처리 및 `isDestroyed`/`isFinishing` 체크 추가. diff --git a/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt index bdcee239..2f35a8a0 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt @@ -15,6 +15,7 @@ import android.widget.ImageButton import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.lifecycleScope import androidx.core.content.ContentProviderCompat.requireContext import bums.lunatic.launcher.R import bums.lunatic.launcher.home.GeckoWeb @@ -76,10 +77,14 @@ class PlayerActivity : AppCompatActivity(), TextureView.SurfaceTextureListener { // 2. 다시 준비 (기존 경로 및 surface 활용) // onPreparedListener에서 resumePos로 다시 seekTo 하도록 설정 nativePlayer?.onPreparedListener = { - nativePlayer?.seekTo(resumePos) - nativePlayer?.play(Surface(videoTextureView.surfaceTexture!!)) + if (!isDestroyed && !isFinishing) { + videoTextureView.surfaceTexture?.let { surfaceTex -> + nativePlayer?.seekTo(resumePos) + nativePlayer?.play(Surface(surfaceTex)) + lastCheckedTime = System.currentTimeMillis() + } + } isRecovering = false - lastCheckedTime = System.currentTimeMillis() // 타임스탬프 갱신 } // 이전에 사용했던 FD를 다시 넘기거나 경로를 통해 다시 Open @@ -370,7 +375,7 @@ class PlayerActivity : AppCompatActivity(), TextureView.SurfaceTextureListener { // UI 갱신 루프 시작 함수 추가 private fun startUIUpdateLoop() { uiUpdateJob?.cancel() - uiUpdateJob = CoroutineScope(Dispatchers.Main).launch { + uiUpdateJob = lifecycleScope.launch(Dispatchers.Main) { while (isActive) { if (isPlaying && !isUserSeeking) { val currentPos = nativePlayer?.getCurrentPosition() ?: 0.0 @@ -487,7 +492,7 @@ class PlayerActivity : AppCompatActivity(), TextureView.SurfaceTextureListener { val leftDetector = GestureDetector(this, object : GestureDetector.SimpleOnGestureListener() { override fun onLongPress(e: MotionEvent) { - leftLongPressJob = CoroutineScope(Dispatchers.Main).launch { + leftLongPressJob = lifecycleScope.launch(Dispatchers.Main) { while (isActive) { nativePlayer?.seekBy(-20.0) delay(500) @@ -652,7 +657,7 @@ class PlayerActivity : AppCompatActivity(), TextureView.SurfaceTextureListener { val targetDir = File(videoPath).parentFile val newSubFile = File(targetDir, "${videoFile.nameWithoutExtension}.srt") - CoroutineScope(Dispatchers.IO).launch { + lifecycleScope.launch(Dispatchers.IO) { try { val request = okhttp3.Request.Builder() .url(url) @@ -714,7 +719,7 @@ class PlayerActivity : AppCompatActivity(), TextureView.SurfaceTextureListener { } // 💡 Dispatchers.Main 대신 Default에서 연산하고 UI만 Main에서 갱신하는 것이 버퍼링 방지에 좋습니다. - subtitleSyncJob = CoroutineScope(Dispatchers.Main).launch { + subtitleSyncJob = lifecycleScope.launch(Dispatchers.Main) { while (isActive) { if (isPlaying) { val currentSec = nativePlayer?.getCurrentPosition() ?: 0.0 @@ -879,7 +884,7 @@ class PlayerActivity : AppCompatActivity(), TextureView.SurfaceTextureListener { Toast.makeText(this, "자막 번역을 시작합니다!", Toast.LENGTH_SHORT).show() // 💡 3. 수백~수천 줄의 자막을 백그라운드에서 한방에 번역 (UI 멈춤 방지) - CoroutineScope(Dispatchers.IO).launch { + lifecycleScope.launch(Dispatchers.IO) { for (block in externalSubtitles) { try { // ML Kit의 번역은 원래 비동기(Task)지만, Tasks.await를 쓰면 동기적으로 쫙 뽑아낼 수 있습니다.