Skip to content

mvvm: move network node actions to NetworkScreenViewModel #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kteja03 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

mvvm: move network node actions to NetworkScreenViewModel #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97864f0
mvvm: move network node actions to NetworkScreenViewModel
Kteja03 Mar 5, 2026
e1a80fd
Fix blocking InetAddress call by moving to IO dispatcher
Kteja03 Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 36 additions & 12 deletions app/src/main/java/com/greybox/projectmesh/viewModel/NetworkScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import com.greybox.projectmesh.DeviceStatusManager
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.coroutines.delay
import org.kodein.di.DI
import com.greybox.projectmesh.server.AppServer
Expand All @@ -32,8 +34,10 @@ data class NetworkScreenModel(
class NetworkScreenViewModel(di:DI, savedStateHandle: SavedStateHandle): ViewModel() {
// _uiState will be updated whenever there is a change in the UI state
private val _uiState = MutableStateFlow(NetworkScreenModel())

// uiState is a read-only property that shows the current UI state
val uiState: Flow<NetworkScreenModel> = _uiState.asStateFlow()

// di is used to get the AndroidVirtualNode instance
private val node: AndroidVirtualNode by di.instance()
private val appServer: AppServer by di.instance()
Expand All @@ -54,7 +58,8 @@ class NetworkScreenViewModel(di:DI, savedStateHandle: SavedStateHandle): ViewMod

// For each disconnected node, notify DeviceStatusManager
disconnectedNodes.forEach { nodeAddress ->
val ipAddress = InetAddress.getByAddress(nodeAddress.addressToByteArray()).hostAddress
val ipAddress =
InetAddress.getByAddress(nodeAddress.addressToByteArray()).hostAddress
DeviceStatusManager.handleNetworkDisconnect(ipAddress)
Log.d("NetworkScreenViewModel", "Detected disconnection of node: $ipAddress")
}
Expand All @@ -77,11 +82,11 @@ class NetworkScreenViewModel(di:DI, savedStateHandle: SavedStateHandle): ViewMod
allNodes = allNodesWithTest,
// update the ssid of the connecting station
connectingInProgressSsid =
if (nodeState.wifiState.wifiStationState.status == WifiStationState.Status.CONNECTING) {
nodeState.wifiState.wifiStationState.config?.ssid
} else {
null
}
if (nodeState.wifiState.wifiStationState.status == WifiStationState.Status.CONNECTING) {
nodeState.wifiState.wifiStationState.config?.ssid
} else {
null
}
)
}

Expand Down Expand Up @@ -187,13 +192,32 @@ class NetworkScreenViewModel(di:DI, savedStateHandle: SavedStateHandle): ViewMod
delay(30000)
}
}
}

*/
fun getDeviceName(wifiAddress: Int) {
viewModelScope.launch {
val inetAddress = InetAddress.getByAddress(wifiAddress.addressToByteArray())
appServer.sendDeviceName(inetAddress)
}

fun onNodeSelected(ipAddress: String) {
viewModelScope.launch {
Copy link
Copy Markdown
Collaborator

@flow733 flow733 Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like wrapping this in viewModelScope.launch changes when the handshake starts compared to navigation.
Navigation now happens immediately, but the user info requests don’t start until the coroutine runs. Since the next screen reads from the DB right away, this can cause it to show missing or stale data (like “Unknown” on first tap).
Before this change, the requests were started before navigating, so this seems like a behavior regression.

try {
val addr = withContext(Dispatchers.IO) {
InetAddress.getByName(ipAddress)
}
appServer.requestRemoteUserInfo(addr)
appServer.pushUserInfoTo(addr)
} catch (e: Exception) {
Log.e("NetworkScreenViewModel", "Failed to request user info for $ipAddress", e)
}
}
}
}

fun getDeviceName(wifiAddress: Int) {
viewModelScope.launch {
val inetAddress = InetAddress.getByAddress(wifiAddress.addressToByteArray())
appServer.sendDeviceName(inetAddress)
}
}
}




15 changes: 3 additions & 12 deletions app/src/main/java/com/greybox/projectmesh/views/NetworkScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.platform.LocalSavedStateRegistryOwner
import androidx.lifecycle.viewmodel.compose.viewModel
import com.greybox.projectmesh.ViewModelFactory
import com.greybox.projectmesh.viewModel.HomeScreenViewModel
import com.greybox.projectmesh.viewModel.NetworkScreenModel
import com.greybox.projectmesh.viewModel.NetworkScreenViewModel
import org.kodein.di.compose.localDI
import com.greybox.projectmesh.extension.WifiListItem
import com.greybox.projectmesh.server.AppServer
import java.net.InetAddress
import org.kodein.di.instance


@Composable
fun NetworkScreen(
Expand All @@ -30,8 +27,7 @@ fun NetworkScreen(
) {
// declare the UI state, we can use the uiState to access the current state of the viewModel
val uiState: NetworkScreenModel by viewModel.uiState.collectAsState(initial = NetworkScreenModel())
val di = localDI()
val appServer: AppServer by di.instance()


// display all the connected station
LazyColumn{
Expand All @@ -43,12 +39,7 @@ fun NetworkScreen(
wifiAddress = eachItem.key,
wifiEntry = eachItem.value,
onClick = { ipAddress ->
//request user info when clicking
val addr = InetAddress.getByName(ipAddress)
appServer.requestRemoteUserInfo(addr)
appServer.pushUserInfoTo(addr)

//Navigate to Ping Screen
viewModel.onNodeSelected(ipAddress)
onNodeClick(ipAddress)
}
)
Expand Down