diff --git a/TODO.md b/TODO.md index 59a99e04..6b91b700 100644 --- a/TODO.md +++ b/TODO.md @@ -119,7 +119,7 @@ ### [Unit 4] 보일러플레이트 코드 제거 및 리팩토링 -- [ ] **4-1. `LauncherActivity` ↔ `NeoRssActivity` 중복 로직 통합** +- [x] **4-1. `LauncherActivity` ↔ `NeoRssActivity` 중복 로직 통합** (`GeckoPreloadManager` 추출 완료) - `app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt:335-360`와 `app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt:92-120`에 `hiddenLoader` + `contentsLoad(url)` 및 `onConfigurationChanged()`(`isOpendFold`, `PointerIcon.TYPE_NULL`) 로직이 거의 동일하게 중복됨. - **작업**: `GeckoPreloadManager`(Delegate) 및 `CommonActivity` 기반 메서드로 추출하여 중복 제거. diff --git a/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt index 164d7eb0..26dd638d 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt @@ -332,23 +332,8 @@ open class LauncherActivity : CommonActivity() { } - var hiddenLoader : HashMap = hashMapOf() - fun contentsLoad(url : String){ - if (isDestroyed == false && isFinishing == false) { - url.toUri()?.host?.let { host -> - if (!hiddenLoader.contains(host)) { - GeckoWeb(this).apply { - LunaticLauncher.mHourlyLogWriter?.writeLog("contentsLoad FIRST_LOAD$host") - hiddenLoader.put(host,this) - loadUrl(url) - } - } else { - hiddenLoader.get(host)?.loadUrl(url) - LunaticLauncher.mHourlyLogWriter?.writeLog("contentsLoad RELOAD$host") - } - } - } - } + private val geckoPreloadManager by lazy { bums.lunatic.launcher.home.GeckoPreloadManager(this) } + fun contentsLoad(url: String) = geckoPreloadManager.load(url) @SuppressLint("MissingSuperCall") override fun onConfigurationChanged(newConfig: Configuration) { @@ -984,13 +969,7 @@ open class LauncherActivity : CommonActivity() { } } networkCallback = null - hiddenLoader.values.forEach { gecko -> - try { - gecko.session?.close() - gecko.releaseSession() - } catch (_: Exception) { } - } - hiddenLoader.clear() + geckoPreloadManager.clear() callBackHandler.removeCallbacksAndMessages(null) if (sActivity === this) { sActivity = null diff --git a/app/src/main/kotlin/bums/lunatic/launcher/home/GeckoPreloadManager.kt b/app/src/main/kotlin/bums/lunatic/launcher/home/GeckoPreloadManager.kt new file mode 100644 index 00000000..5c6431d5 --- /dev/null +++ b/app/src/main/kotlin/bums/lunatic/launcher/home/GeckoPreloadManager.kt @@ -0,0 +1,38 @@ +package bums.lunatic.launcher.home + +import android.app.Activity +import androidx.core.net.toUri +import bums.lunatic.launcher.LunaticLauncher + +/** + * Manages host-keyed hidden GeckoWeb instances for background preloading and lifecycle cleanup. + */ +class GeckoPreloadManager(private val activity: Activity) { + private val hiddenLoader: HashMap = hashMapOf() + + fun load(url: String) { + if (activity.isDestroyed || activity.isFinishing) return + val host = url.toUri().host ?: return + val existing = hiddenLoader[host] + if (existing == null) { + GeckoWeb(activity).apply { + LunaticLauncher.mHourlyLogWriter?.writeLog("contentsLoad FIRST_LOAD$host") + hiddenLoader[host] = this + loadUrl(url) + } + } else { + existing.loadUrl(url) + LunaticLauncher.mHourlyLogWriter?.writeLog("contentsLoad RELOAD$host") + } + } + + fun clear() { + hiddenLoader.values.forEach { gecko -> + try { + gecko.session?.close() + gecko.releaseSession() + } catch (_: Exception) { } + } + hiddenLoader.clear() + } +} diff --git a/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt index bcc457ee..66f2518f 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt @@ -89,23 +89,8 @@ open class NeoRssActivity : CommonActivity() { @JvmStatic var lActivity: NeoRssActivity? = null } - var hiddenLoader : HashMap = hashMapOf() - fun contentsLoad(url : String){ - if (isDestroyed == false && isFinishing == false) { - url.toUri()?.host?.let { host -> - if (!hiddenLoader.contains(host)) { - GeckoWeb(this).apply { - LunaticLauncher.Companion.mHourlyLogWriter?.writeLog("contentsLoad FIRST_LOAD$host") - hiddenLoader.put(host,this) - loadUrl(url) - } - } else { - hiddenLoader.get(host)?.loadUrl(url) - LunaticLauncher.Companion.mHourlyLogWriter?.writeLog("contentsLoad RELOAD$host") - } - } - } - } + private val geckoPreloadManager by lazy { GeckoPreloadManager(this) } + fun contentsLoad(url: String) = geckoPreloadManager.load(url) override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) @@ -700,13 +685,7 @@ open class NeoRssActivity : CommonActivity() { override fun onDestroy() { try { - hiddenLoader.values.forEach { gecko -> - try { - gecko.session?.close() - gecko.releaseSession() - } catch (_: Exception) { } - } - hiddenLoader.clear() + geckoPreloadManager.clear() flingHandler.removeCallbacksAndMessages(null) callBackHandler.removeCallbacksAndMessages(null) if (lActivity === this) {