diff --git a/TODO.md b/TODO.md index 643cdbc3..afe8507e 100644 --- a/TODO.md +++ b/TODO.md @@ -43,7 +43,7 @@ - `app/src/main/kotlin/bums/lunatic/launcher/home/RssHome.kt:95` — `var home: RssHome? = null` 정적 참조로 Fragment 및 연결된 View/Binding 누수 위험. - **작업**: 정적 Activity/Fragment 참조를 `WeakReference` 또는 이벤트 버스(`SharedFlow`/`ViewModel`)로 대체하고, 최소한 `onDestroy()`/`onDestroyView()`에서 `null` 처리. -- [ ] **1-2. 전역 `Toast` 인스턴스의 `Context` 누수 해결** +- [x] **1-2. 전역 `Toast` 인스턴스의 `Context` 누수 해결** - `app/src/main/kotlin/bums/lunatic/launcher/LunaticLauncher.kt:62-75` — `companion object`의 `var toast: Toast? = null`에 `Context.toast()` 호출 시 전달된 `Context`(Activity일 수 있음)로 `Toast(this)`를 생성해 정적으로 유지함. - **작업**: `Toast(applicationContext)`를 사용하거나 매 호출 시 지역 `Toast`를 생성하고 기존 `toast?.cancel()` 후 참조를 유지하지 않도록 변경. diff --git a/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt index 3970f541..164d7eb0 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt @@ -976,7 +976,25 @@ open class LauncherActivity : CommonActivity() { // smsReceiver = null // } - networkCallback?.let { connectivityManager.unregisterNetworkCallback(it) } + if (::connectivityManager.isInitialized) { + networkCallback?.let { + try { + connectivityManager.unregisterNetworkCallback(it) + } catch (_: Exception) { } + } + } + networkCallback = null + hiddenLoader.values.forEach { gecko -> + try { + gecko.session?.close() + gecko.releaseSession() + } catch (_: Exception) { } + } + hiddenLoader.clear() + callBackHandler.removeCallbacksAndMessages(null) + if (sActivity === this) { + sActivity = null + } super.onDestroy() } diff --git a/app/src/main/kotlin/bums/lunatic/launcher/LunaticLauncher.kt b/app/src/main/kotlin/bums/lunatic/launcher/LunaticLauncher.kt index e5dd20e1..ebf155fe 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/LunaticLauncher.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/LunaticLauncher.kt @@ -59,19 +59,20 @@ internal class LunaticLauncher : Application() { } var privateCompletedDir : File? = null - var toast : Toast? = null + private var toastRef: java.lang.ref.WeakReference? = null fun Context.toast(msg: String) { val biggerText = SpannableStringBuilder(msg) biggerText.setSpan(RelativeSizeSpan(1.6f), 0, msg.length, 0) - val view: View = inflate(this, R.layout.simple_toast, null) + val appCtx = applicationContext ?: this + val view: View = inflate(appCtx, R.layout.simple_toast, null) view.findViewById(R.id.text).text = biggerText - if (toast==null) { - toast = Toast(this) - toast?.duration = Toast.LENGTH_SHORT - toast?.cancel() + toastRef?.get()?.cancel() + Toast(appCtx).apply { + duration = Toast.LENGTH_SHORT + this.view = view + toastRef = java.lang.ref.WeakReference(this) + show() } - toast?.view = view - toast?.show() } }