Compare commits

..

2 Commits

3 changed files with 3 additions and 4 deletions

View File

@@ -68,7 +68,6 @@ fun WallencNavRoot(
deepLinkIntent: Intent = Intent(), deepLinkIntent: Intent = Intent(),
) { ) {
val navState = rememberNavigationState() val navState = rememberNavigationState()
val mainNavState = rememberNavigationState()
val mainViewModel: MainViewModel = hiltViewModel() val mainViewModel: MainViewModel = hiltViewModel()
val settingsViewModel: SettingsViewModel = hiltViewModel() val settingsViewModel: SettingsViewModel = hiltViewModel()
@@ -150,7 +149,6 @@ fun WallencNavRoot(
) { ) {
MainScreen( MainScreen(
modifier = Modifier, modifier = Modifier,
navState = mainNavState,
viewModel = mainViewModel, viewModel = mainViewModel,
) )
} }

View File

@@ -35,5 +35,5 @@ fun rememberNavigationState(
navHostController: NavHostController? = null navHostController: NavHostController? = null
): NavigationState { ): NavigationState {
val controller = navHostController ?: rememberNavController() val controller = navHostController ?: rememberNavController()
return remember { NavigationState(controller) } return remember(controller) { NavigationState(controller) }
} }

View File

@@ -7,6 +7,7 @@ import com.github.nullptroma.wallenc.domain.datatypes.StorageMetaLoadState
import com.github.nullptroma.wallenc.domain.datatypes.Tree import com.github.nullptroma.wallenc.domain.datatypes.Tree
import com.github.nullptroma.wallenc.domain.errors.WallencException import com.github.nullptroma.wallenc.domain.errors.WallencException
import com.github.nullptroma.wallenc.domain.errors.toWallencException import com.github.nullptroma.wallenc.domain.errors.toWallencException
import java.io.IOException
import com.github.nullptroma.wallenc.domain.interfaces.ILogger import com.github.nullptroma.wallenc.domain.interfaces.ILogger
import com.github.nullptroma.wallenc.domain.interfaces.IStorage import com.github.nullptroma.wallenc.domain.interfaces.IStorage
import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
@@ -191,7 +192,7 @@ abstract class AbstractVaultBrowserViewModel(
ctx.log(TaskLogLevel.Info, uiStrings(R.string.task_log_rescan_vault_storages_done)) ctx.log(TaskLogLevel.Info, uiStrings(R.string.task_log_rescan_vault_storages_done))
val vault = manageVaultUseCase.find(vaultUuid) val vault = manageVaultUseCase.find(vaultUuid)
if (vault != null && !vault.isAvailable.value) { if (vault != null && !vault.isAvailable.value) {
emitTaskError(WallencException.Network.IoFailed()) emitTaskError(WallencException.Network.IoFailed(IOException("Vault unreachable")))
} }
} catch (e: Exception) { } catch (e: Exception) {
logger.debug(TAG, "rescanStorages failed: ${e.stackTraceToString()}") logger.debug(TAG, "rescanStorages failed: ${e.stackTraceToString()}")