fix: Fix lateinit property eventHandler has not been initialized (#25)

Author: MarcaDian

app/src/main/java/app/revanced/manager/MainActivity.kt

@@ -117,31 +117,11 @@ class MainActivity : ComponentActivity() {
     }
 }
 
-// Work around to solve issue of the settings menu needing to trigger an event
-// in the main screen. But since the setting menu is not a child of the main screen,
-// it's tricky passing the event from one UI sibling to another.
-// Use this event work around to propagate the change to the main screen.
-class PreReleaseChangedModel : ViewModel() {
-    private lateinit var eventHandler: (suspend (Boolean) -> Unit)
-
-    fun setEventHandler(handler: suspend (Boolean) -> Unit) {
-        eventHandler = handler
-    }
-
-    fun preReleaseChanged(preReleaseValue: Boolean) {
-        viewModelScope.launch {
-            eventHandler.invoke(preReleaseValue)
-        }
-    }
-}
-
 @Composable
 private fun ReVancedManager(vm: MainViewModel) {
     val navController = rememberNavController()
     val prefs: PreferencesManager = koinInject()
     val useMorpheHomeScreen by prefs.useMorpheHomeScreen.getAsState()
-    val preReleaseChangedModel = PreReleaseChangedModel()
-
     val startDest = if (useMorpheHomeScreen) MorpheHomeScreen else Dashboard
 
     EventEffect(vm.appSelectFlow) { params ->
@@ -183,8 +163,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                 },
                 dashboardViewModel = dashboardViewModel,
                 usingMountInstallState = usingMountInstallState,
-                bundleUpdateProgress = bundleUpdateProgress,
-                preReleaseChangedModel = preReleaseChangedModel
+                bundleUpdateProgress = bundleUpdateProgress
             )
         }
 
@@ -473,8 +452,7 @@ private fun ReVancedManager(vm: MainViewModel) {
             // Morphe Simplified Settings Screen
             composable<MorpheSettings> {
                 MorpheSettingsScreen(
-                    onBackClick = navController::popBackStack,
-                    preReleaseChangedModel = preReleaseChangedModel
+                    onBackClick = navController::popBackStack
                 )
             }
         }

app/src/main/java/app/revanced/manager/ui/screen/MorpheHomeScreen.kt

@@ -17,7 +17,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.morphe.manager.R
-import app.revanced.manager.PreReleaseChangedModel
 import app.revanced.manager.domain.bundles.RemotePatchBundle
 import app.revanced.manager.domain.manager.InstallerPreferenceTokens
 import app.revanced.manager.domain.manager.PreferencesManager
@@ -62,7 +61,6 @@ fun MorpheHomeScreen(
     prefs: PreferencesManager = koinInject(),
     usingMountInstallState: MutableState<Boolean>,
     bundleUpdateProgress: PatchBundleRepository.BundleUpdateProgress?,
-    preReleaseChangedModel: PreReleaseChangedModel,
     generalViewModel: GeneralSettingsViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
@@ -99,13 +97,7 @@ fun MorpheHomeScreen(
         bundleUpdateInProgress = true
         homeState.isRefreshingBundle = true
         try {
-            dashboardViewModel.patchBundleRepository.updateOnlyMorpheBundleWithResult(
-                showProgress = true,
-                showToast = false
-            )
-
-            // Also clear changelog cache after bundle update
-            (homeState.apiBundle as? RemotePatchBundle)?.clearChangelogCache()
+            dashboardViewModel.updateMorpheBundleWithChangelogClear()
         } finally {
             delay(500)
             bundleUpdateInProgress = false
@@ -114,11 +106,6 @@ fun MorpheHomeScreen(
         }
     }
 
-    preReleaseChangedModel.setEventHandler { usePreRelease ->
-        prefs.usePatchesPrereleases.update(usePreRelease)
-        updateMorpheBundleAndUI()
-    }
-
     // Show manager update available dialog
     if (homeState.shouldShowUpdateDialog) {
         ManagerUpdateAvailableDialog(

app/src/main/java/app/revanced/manager/ui/screen/MorpheSettingsScreen.kt

@@ -30,19 +30,21 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.morphe.manager.BuildConfig
 import app.morphe.manager.R
-import app.revanced.manager.PreReleaseChangedModel
+import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.network.downloader.DownloaderPluginState
 import app.revanced.manager.ui.component.ExceptionViewerDialog
 import app.revanced.manager.ui.component.morphe.settings.*
 import app.revanced.manager.ui.component.morphe.shared.AnimatedBackground
 import app.revanced.manager.ui.component.morphe.shared.BackgroundType
+import app.revanced.manager.ui.viewmodel.DashboardViewModel
 import app.revanced.manager.ui.viewmodel.DownloadsViewModel
 import app.revanced.manager.ui.viewmodel.GeneralSettingsViewModel
 import app.revanced.manager.ui.viewmodel.ImportExportViewModel
 import app.revanced.manager.util.toast
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.koinInject
 
 /**
  * MorpheSettingsScreen - Simplified settings interface
@@ -54,16 +56,17 @@ import org.koin.androidx.compose.koinViewModel
 @Composable
 fun MorpheSettingsScreen(
     onBackClick: () -> Unit,
-    preReleaseChangedModel: PreReleaseChangedModel,
     generalViewModel: GeneralSettingsViewModel = koinViewModel(),
     downloadsViewModel: DownloadsViewModel = koinViewModel(),
-    importExportViewModel: ImportExportViewModel = koinViewModel()
+    importExportViewModel: ImportExportViewModel = koinViewModel(),
+    dashboardViewModel: DashboardViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
     val scrollState = rememberScrollState()
     val coroutineScope = rememberCoroutineScope()
     val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
+    val prefs: PreferencesManager = koinInject()
     val usePrereleases = generalViewModel.prefs.usePatchesPrereleases.getAsState()
 
     // Appearance settings
@@ -217,7 +220,10 @@ fun MorpheSettingsScreen(
                         UpdatesSection(
                             usePrereleases = usePrereleases,
                             onPreReleaseChanged = { newValue ->
-                                preReleaseChangedModel.preReleaseChanged(newValue)
+                                coroutineScope.launch {
+                                    prefs.usePatchesPrereleases.update(newValue)
+                                    dashboardViewModel.updateMorpheBundleWithChangelogClear()
+                                }
                             }
                         )
                     }
@@ -279,7 +285,10 @@ fun MorpheSettingsScreen(
                     UpdatesSection(
                         usePrereleases = usePrereleases,
                         onPreReleaseChanged = { newValue ->
-                            preReleaseChangedModel.preReleaseChanged(newValue)
+                            coroutineScope.launch {
+                                prefs.usePatchesPrereleases.update(newValue)
+                                dashboardViewModel.updateMorpheBundleWithChangelogClear()
+                            }
                         }
                     )
 

app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt

@@ -23,6 +23,7 @@ import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.uiSafe
 import app.morphe.manager.R
+import app.revanced.manager.domain.bundles.RemotePatchBundle
 import app.revanced.manager.domain.installer.RootInstaller
 import app.revanced.manager.domain.repository.PatchBundleRepository.Companion.DEFAULT_SOURCE_UID
 import kotlinx.coroutines.NonCancellable
@@ -162,4 +163,16 @@ class DashboardViewModel(
             patchBundleRepository.createRemote(apiUrl, autoUpdate)
         }
     }
+
+    suspend fun updateMorpheBundleWithChangelogClear() {
+        patchBundleRepository.updateOnlyMorpheBundleWithResult(
+            showProgress = true,
+            showToast = false
+        )
+
+        // Clear changelog cache
+        val sources = patchBundleRepository.sources.first()
+        val apiBundle = sources.firstOrNull() as? RemotePatchBundle
+        apiBundle?.clearChangelogCache()
+    }
 }