Skip to content

Commit 52b27a6

Browse files
committed
fix "as MainActivityX" (real and potential) crashes
1 parent afd12dc commit 52b27a6

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

src/main/java/com/machiav3lli/backup/pages/AppPage.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,20 @@ import androidx.compose.ui.text.style.TextOverflow
6464
import androidx.compose.ui.unit.dp
6565
import com.machiav3lli.backup.OABX
6666
import com.machiav3lli.backup.R
67-
import com.machiav3lli.backup.activities.MainActivityX
6867
import com.machiav3lli.backup.dbs.entity.Backup
6968
import com.machiav3lli.backup.dbs.entity.Schedule
7069
import com.machiav3lli.backup.dialogs.ActionsDialogUI
7170
import com.machiav3lli.backup.dialogs.BackupDialogUI
7271
import com.machiav3lli.backup.dialogs.BaseDialog
7372
import com.machiav3lli.backup.dialogs.RestoreDialogUI
7473
import com.machiav3lli.backup.dialogs.StringInputDialogUI
74+
import com.machiav3lli.backup.entity.Package
7575
import com.machiav3lli.backup.exodusUrl
7676
import com.machiav3lli.backup.handler.BackupRestoreHelper
7777
import com.machiav3lli.backup.handler.ShellCommands
7878
import com.machiav3lli.backup.handler.ShellCommands.Companion.currentProfile
7979
import com.machiav3lli.backup.handler.ShellHandler
8080
import com.machiav3lli.backup.handler.ShellHandler.Companion.runAsRoot
81-
import com.machiav3lli.backup.entity.Package
8281
import com.machiav3lli.backup.preferences.pref_numBackupRevisions
8382
import com.machiav3lli.backup.preferences.pref_useWorkManagerForSingleManualJob
8483
import com.machiav3lli.backup.preferences.traceCompose
@@ -131,7 +130,7 @@ fun AppPage(
131130
onDismiss: () -> Unit,
132131
) {
133132
val context = LocalContext.current
134-
val mActivity = context as MainActivityX
133+
val mActivity = OABX.main!!
135134
val openDialog = remember { mutableStateOf(false) }
136135
val dialogProps: MutableState<Pair<Int, Any>> = remember {
137136
mutableStateOf(Pair(DIALOG_NONE, Schedule()))

src/main/java/com/machiav3lli/backup/pages/PermissionsPage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ import timber.log.Timber
8686
fun PermissionsPage() {
8787
val context = LocalContext.current
8888
val mScope = CoroutineScope(Dispatchers.Main)
89-
val mainActivity = context as MainActivityX
89+
val mainActivity = OABX.main!!
9090
val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
9191
val permissionsList = remember {
9292
mutableStateMapOf<Permission, () -> Unit>()

src/main/java/com/machiav3lli/backup/pages/WelcomePage.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import androidx.compose.ui.graphics.Color
4141
import androidx.compose.ui.platform.LocalContext
4242
import androidx.compose.ui.res.stringResource
4343
import androidx.compose.ui.unit.dp
44+
import com.machiav3lli.backup.OABX
4445
import com.machiav3lli.backup.R
45-
import com.machiav3lli.backup.activities.MainActivityX
4646
import com.machiav3lli.backup.linksList
4747
import com.machiav3lli.backup.ui.compose.blockBorderBottom
4848
import com.machiav3lli.backup.ui.compose.icons.Phosphor
@@ -76,7 +76,7 @@ fun WelcomePage() {
7676
text = stringResource(id = R.string.dialog_start),
7777
icon = Phosphor.ArrowRight,
7878
) {
79-
(context as MainActivityX).moveTo(NavItem.Permissions.destination)
79+
OABX.main?.moveTo(NavItem.Permissions.destination)
8080
}
8181
}
8282
}

src/main/java/com/machiav3lli/backup/preferences/ToolsPreferences.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ import androidx.compose.ui.unit.dp
2323
import com.machiav3lli.backup.OABX
2424
import com.machiav3lli.backup.R
2525
import com.machiav3lli.backup.activities.MainActivityX
26+
import com.machiav3lli.backup.entity.LinkPref
27+
import com.machiav3lli.backup.entity.Package
28+
import com.machiav3lli.backup.entity.Pref
2629
import com.machiav3lli.backup.handler.BackupRestoreHelper
2730
import com.machiav3lli.backup.handler.showNotification
28-
import com.machiav3lli.backup.entity.Package
2931
import com.machiav3lli.backup.preferences.ui.PrefsGroup
3032
import com.machiav3lli.backup.ui.compose.icons.Phosphor
3133
import com.machiav3lli.backup.ui.compose.icons.phosphor.AndroidLogo
@@ -39,8 +41,6 @@ import com.machiav3lli.backup.ui.compose.show
3941
import com.machiav3lli.backup.ui.compose.theme.ColorDeData
4042
import com.machiav3lli.backup.ui.compose.theme.ColorExodus
4143
import com.machiav3lli.backup.ui.compose.theme.ColorExtDATA
42-
import com.machiav3lli.backup.entity.LinkPref
43-
import com.machiav3lli.backup.entity.Pref
4444
import com.machiav3lli.backup.ui.navigation.NavItem
4545
import com.machiav3lli.backup.utils.BACKUP_DATE_TIME_FORMATTER
4646
import com.machiav3lli.backup.utils.SystemUtils
@@ -61,7 +61,7 @@ import java.time.LocalDateTime
6161
@Composable
6262
fun ToolsPrefsPage() {
6363
val context = LocalContext.current
64-
val neoActivity = context as MainActivityX
64+
val neoActivity = OABX.main!!
6565
val snackbarHostState = remember { SnackbarHostState() }
6666
val coroutineScope = rememberCoroutineScope()
6767

src/main/java/com/machiav3lli/backup/sheets/SortFilterSheet.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ import com.machiav3lli.backup.MAIN_FILTER_DEFAULT
5353
import com.machiav3lli.backup.OABX
5454
import com.machiav3lli.backup.R
5555
import com.machiav3lli.backup.SPECIAL_FILTER_ALL
56-
import com.machiav3lli.backup.activities.MainActivityX
5756
import com.machiav3lli.backup.enabledFilterChipItems
58-
import com.machiav3lli.backup.installedFilterChipItems
57+
import com.machiav3lli.backup.entity.ChipItem
58+
import com.machiav3lli.backup.entity.InfoChipItem
5959
import com.machiav3lli.backup.entity.SortFilterModel
60+
import com.machiav3lli.backup.installedFilterChipItems
6061
import com.machiav3lli.backup.latestFilterChipItems
6162
import com.machiav3lli.backup.launchableFilterChipItems
6263
import com.machiav3lli.backup.mainBackupModeChipItems
@@ -76,8 +77,6 @@ import com.machiav3lli.backup.ui.compose.item.SwitchChip
7677
import com.machiav3lli.backup.ui.compose.recycler.InfoChipsBlock
7778
import com.machiav3lli.backup.ui.compose.recycler.MultiSelectableChipGroup
7879
import com.machiav3lli.backup.ui.compose.recycler.SelectableChipGroup
79-
import com.machiav3lli.backup.entity.ChipItem
80-
import com.machiav3lli.backup.entity.InfoChipItem
8180
import com.machiav3lli.backup.updatedFilterChipItems
8281
import com.machiav3lli.backup.utils.applyFilter
8382
import com.machiav3lli.backup.utils.getStats
@@ -87,7 +86,7 @@ import com.machiav3lli.backup.utils.specialBackupsEnabled
8786
@Composable
8887
fun SortFilterSheet(onDismiss: () -> Unit) { // TODO add key for each page (HOME, BACKUP, RESTORE)
8988
val context = LocalContext.current
90-
val mActivity = context as MainActivityX
89+
val mActivity = OABX.main!!
9190
val nestedScrollConnection = rememberNestedScrollInteropConnection()
9291
val packageList by mActivity.viewModel.notBlockedList.collectAsState()
9392
var model by rememberSaveable { mutableStateOf(sortFilterModel) }

0 commit comments

Comments
 (0)