fix "as MainActivityX" (real and potential) crashes

NeoApplications · Oct 25, 2024 · 52b27a6 · 52b27a6
1 parent afd12dc
commit 52b27a6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/src/main/java/com/machiav3lli/backup/pages/AppPage.kt b/src/main/java/com/machiav3lli/backup/pages/AppPage.kt
@@ -64,21 +64,20 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.machiav3lli.backup.OABX
 import com.machiav3lli.backup.R
-import com.machiav3lli.backup.activities.MainActivityX
 import com.machiav3lli.backup.dbs.entity.Backup
 import com.machiav3lli.backup.dbs.entity.Schedule
 import com.machiav3lli.backup.dialogs.ActionsDialogUI
 import com.machiav3lli.backup.dialogs.BackupDialogUI
 import com.machiav3lli.backup.dialogs.BaseDialog
 import com.machiav3lli.backup.dialogs.RestoreDialogUI
 import com.machiav3lli.backup.dialogs.StringInputDialogUI
+import com.machiav3lli.backup.entity.Package
 import com.machiav3lli.backup.exodusUrl
 import com.machiav3lli.backup.handler.BackupRestoreHelper
 import com.machiav3lli.backup.handler.ShellCommands
 import com.machiav3lli.backup.handler.ShellCommands.Companion.currentProfile
 import com.machiav3lli.backup.handler.ShellHandler
 import com.machiav3lli.backup.handler.ShellHandler.Companion.runAsRoot
-import com.machiav3lli.backup.entity.Package
 import com.machiav3lli.backup.preferences.pref_numBackupRevisions
 import com.machiav3lli.backup.preferences.pref_useWorkManagerForSingleManualJob
 import com.machiav3lli.backup.preferences.traceCompose
@@ -131,7 +130,7 @@ fun AppPage(
     onDismiss: () -> Unit,
 ) {
     val context = LocalContext.current
-    val mActivity = context as MainActivityX
+    val mActivity = OABX.main!!
     val openDialog = remember { mutableStateOf(false) }
     val dialogProps: MutableState<Pair<Int, Any>> = remember {
         mutableStateOf(Pair(DIALOG_NONE, Schedule()))

diff --git a/src/main/java/com/machiav3lli/backup/pages/PermissionsPage.kt b/src/main/java/com/machiav3lli/backup/pages/PermissionsPage.kt
@@ -86,7 +86,7 @@ import timber.log.Timber
 fun PermissionsPage() {
     val context = LocalContext.current
     val mScope = CoroutineScope(Dispatchers.Main)
-    val mainActivity = context as MainActivityX
+    val mainActivity = OABX.main!!
     val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
     val permissionsList = remember {
         mutableStateMapOf<Permission, () -> Unit>()

diff --git a/src/main/java/com/machiav3lli/backup/pages/WelcomePage.kt b/src/main/java/com/machiav3lli/backup/pages/WelcomePage.kt
@@ -41,8 +41,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.machiav3lli.backup.OABX
 import com.machiav3lli.backup.R
-import com.machiav3lli.backup.activities.MainActivityX
 import com.machiav3lli.backup.linksList
 import com.machiav3lli.backup.ui.compose.blockBorderBottom
 import com.machiav3lli.backup.ui.compose.icons.Phosphor
@@ -76,7 +76,7 @@ fun WelcomePage() {
                     text = stringResource(id = R.string.dialog_start),
                     icon = Phosphor.ArrowRight,
                 ) {
-                    (context as MainActivityX).moveTo(NavItem.Permissions.destination)
+                    OABX.main?.moveTo(NavItem.Permissions.destination)
                 }
             }
         }

diff --git a/src/main/java/com/machiav3lli/backup/preferences/ToolsPreferences.kt b/src/main/java/com/machiav3lli/backup/preferences/ToolsPreferences.kt
@@ -23,9 +23,11 @@ import androidx.compose.ui.unit.dp
 import com.machiav3lli.backup.OABX
 import com.machiav3lli.backup.R
 import com.machiav3lli.backup.activities.MainActivityX
+import com.machiav3lli.backup.entity.LinkPref
+import com.machiav3lli.backup.entity.Package
+import com.machiav3lli.backup.entity.Pref
 import com.machiav3lli.backup.handler.BackupRestoreHelper
 import com.machiav3lli.backup.handler.showNotification
-import com.machiav3lli.backup.entity.Package
 import com.machiav3lli.backup.preferences.ui.PrefsGroup
 import com.machiav3lli.backup.ui.compose.icons.Phosphor
 import com.machiav3lli.backup.ui.compose.icons.phosphor.AndroidLogo
@@ -39,8 +41,6 @@ import com.machiav3lli.backup.ui.compose.show
 import com.machiav3lli.backup.ui.compose.theme.ColorDeData
 import com.machiav3lli.backup.ui.compose.theme.ColorExodus
 import com.machiav3lli.backup.ui.compose.theme.ColorExtDATA
-import com.machiav3lli.backup.entity.LinkPref
-import com.machiav3lli.backup.entity.Pref
 import com.machiav3lli.backup.ui.navigation.NavItem
 import com.machiav3lli.backup.utils.BACKUP_DATE_TIME_FORMATTER
 import com.machiav3lli.backup.utils.SystemUtils
@@ -61,7 +61,7 @@ import java.time.LocalDateTime
 @Composable
 fun ToolsPrefsPage() {
     val context = LocalContext.current
-    val neoActivity = context as MainActivityX
+    val neoActivity = OABX.main!!
     val snackbarHostState = remember { SnackbarHostState() }
     val coroutineScope = rememberCoroutineScope()
 

diff --git a/src/main/java/com/machiav3lli/backup/sheets/SortFilterSheet.kt b/src/main/java/com/machiav3lli/backup/sheets/SortFilterSheet.kt
@@ -53,10 +53,11 @@ import com.machiav3lli.backup.MAIN_FILTER_DEFAULT
 import com.machiav3lli.backup.OABX
 import com.machiav3lli.backup.R
 import com.machiav3lli.backup.SPECIAL_FILTER_ALL
-import com.machiav3lli.backup.activities.MainActivityX
 import com.machiav3lli.backup.enabledFilterChipItems
-import com.machiav3lli.backup.installedFilterChipItems
+import com.machiav3lli.backup.entity.ChipItem
+import com.machiav3lli.backup.entity.InfoChipItem
 import com.machiav3lli.backup.entity.SortFilterModel
+import com.machiav3lli.backup.installedFilterChipItems
 import com.machiav3lli.backup.latestFilterChipItems
 import com.machiav3lli.backup.launchableFilterChipItems
 import com.machiav3lli.backup.mainBackupModeChipItems
@@ -76,8 +77,6 @@ import com.machiav3lli.backup.ui.compose.item.SwitchChip
 import com.machiav3lli.backup.ui.compose.recycler.InfoChipsBlock
 import com.machiav3lli.backup.ui.compose.recycler.MultiSelectableChipGroup
 import com.machiav3lli.backup.ui.compose.recycler.SelectableChipGroup
-import com.machiav3lli.backup.entity.ChipItem
-import com.machiav3lli.backup.entity.InfoChipItem
 import com.machiav3lli.backup.updatedFilterChipItems
 import com.machiav3lli.backup.utils.applyFilter
 import com.machiav3lli.backup.utils.getStats
@@ -87,7 +86,7 @@ import com.machiav3lli.backup.utils.specialBackupsEnabled
 @Composable
 fun SortFilterSheet(onDismiss: () -> Unit) { // TODO add key for each page (HOME, BACKUP, RESTORE)
     val context = LocalContext.current
-    val mActivity = context as MainActivityX
+    val mActivity = OABX.main!!
     val nestedScrollConnection = rememberNestedScrollInteropConnection()
     val packageList by mActivity.viewModel.notBlockedList.collectAsState()
     var model by rememberSaveable { mutableStateOf(sortFilterModel) }