diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f4e5c65..93597d1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">
+
= networkMonitor.isConnected
+ fun isCurrentlyConnected(): Boolean = networkMonitor.isCurrentlyConnected()
val allActivities: Flow> = dao.getAllActivities()
@@ -34,6 +38,10 @@ class MaintenanceRepository(
dao.getUserAccess(email)
}
+ suspend fun getUnsyncedActivities(): List = withContext(Dispatchers.IO) {
+ dao.getUnsyncedActivities()
+ }
+
/**
* Updates progress of an OS, auto-generates a history record, and marks as unsynced (offline-first).
*/
diff --git a/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt b/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt
index 367075d..039243d 100644
--- a/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt
+++ b/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt
@@ -192,6 +192,7 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
)
// Reactive Flow for the current activity's edit history
+ @OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
val selectedActivityHistory: StateFlow> = _selectedActivity
.flatMapLatest { activity ->
if (activity != null) {
@@ -212,26 +213,20 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
savedUser?.let {
checkUserAccessLevel(it.email)
}
- // Automatically check and pull service orders from Sheets on first launch.
+
+ // Monitor network state and trigger auto-sync on connection or when pending items exist
viewModelScope.launch {
- val currentList = repository.allActivities.first()
- if (currentList.isEmpty()) {
- _internetAvailable.value = true
- _isSyncing.value = true
- _syncStatusMessage.value = "Conectando ao servidor Cargill para baixar ordens de serviço..."
-
- when (val result = repository.synchronizeWithBackend()) {
- is SyncResult.Success -> {
- _syncStatusMessage.value = "Sincronização inicial concluída! ${result.syncedItems} OSs sincronizadas."
- _currentUser.value?.let { user ->
- checkUserAccessLevel(user.email)
- }
- }
- is SyncResult.Error -> {
- _syncStatusMessage.value = "Falha na sincronização inicial: ${result.message}"
+ var isFirstEmission = true
+ repository.isNetworkConnected.collect { isConnected ->
+ _internetAvailable.value = isConnected
+ if (isConnected) {
+ val pending = repository.getUnsyncedActivities()
+ val currentList = repository.allActivities.first()
+ if (pending.isNotEmpty() || currentList.isEmpty() || !isFirstEmission) {
+ syncNow()
}
}
- _isSyncing.value = false
+ isFirstEmission = false
}
}
}
@@ -269,8 +264,7 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
}
fun toggleInternet(available: Boolean) {
- // App is always online.
- _internetAvailable.value = true
+ _internetAvailable.value = available
}
fun clearMessages() {
@@ -287,14 +281,15 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
val result = repository.importCsvFromUri(context, uri)
result.onSuccess { count ->
_importStatusMessage.value = "Sucesso: $count ordens de serviço importadas/atualizadas!"
+ if (_internetAvailable.value) {
+ syncNow()
+ }
}.onFailure { error ->
_importStatusMessage.value = "Erro na importação: ${error.localizedMessage}"
}
}
}
-
-
/**
* Performs synchronized check.
*/
@@ -303,6 +298,9 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
_syncStatusMessage.value = "Sincronização impossível: Sem conectividade de rede na área atual."
return
}
+ if (_isSyncing.value) {
+ return
+ }
viewModelScope.launch {
_isSyncing.value = true
@@ -374,6 +372,10 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
_selectedActivity.value = updatedList.find { it.numeroOs == numeroOs }
}
}
+ // Auto-trigger sync attempt if internet is available
+ if (_internetAvailable.value) {
+ syncNow()
+ }
}
}
diff --git a/app/src/main/java/com/example/util/NetworkMonitor.kt b/app/src/main/java/com/example/util/NetworkMonitor.kt
new file mode 100644
index 0000000..920a134
--- /dev/null
+++ b/app/src/main/java/com/example/util/NetworkMonitor.kt
@@ -0,0 +1,59 @@
+package com.example.util
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+
+class NetworkMonitor(context: Context) {
+ private val connectivityManager =
+ context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+ val isConnected: Flow = callbackFlow {
+ val callback = object : ConnectivityManager.NetworkCallback() {
+ override fun onAvailable(network: Network) {
+ trySend(true)
+ }
+
+ override fun onLost(network: Network) {
+ trySend(isCurrentlyConnected())
+ }
+
+ override fun onUnavailable() {
+ trySend(false)
+ }
+ }
+
+ // Send initial state immediately
+ trySend(isCurrentlyConnected())
+
+ val request = NetworkRequest.Builder()
+ .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+ .build()
+
+ try {
+ connectivityManager.registerNetworkCallback(request, callback)
+ } catch (e: Exception) {
+ trySend(isCurrentlyConnected())
+ }
+
+ awaitClose {
+ try {
+ connectivityManager.unregisterNetworkCallback(callback)
+ } catch (e: Exception) {
+ // Ignore if unregister fails on teardown
+ }
+ }
+ }.distinctUntilChanged()
+
+ fun isCurrentlyConnected(): Boolean {
+ val activeNetwork = connectivityManager.activeNetwork ?: return false
+ val capabilities = connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false
+ return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+ }
+}