This commit is contained in:
pierre
2023-08-28 22:14:58 +02:00
parent 5f9a514bc7
commit 2fdd09deee
3 changed files with 6 additions and 12 deletions
@@ -71,11 +71,6 @@ class MainActivity : ComponentActivity() {
) {
viewModel.setUiConnected()
}
if (proxyState == NymProxy.Companion.State.DISCONNECTED &&
workState != WorkInfo.State.RUNNING
) {
viewModel.setUiDisconnected()
}
}
}
@@ -10,7 +10,6 @@ import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequest
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.OutOfQuotaPolicy
import androidx.work.WorkInfo
import androidx.work.WorkManager
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
@@ -49,7 +48,7 @@ class MainViewModel(
val uiState: StateFlow<ProxyState> = _uiState.asStateFlow()
fun setUiConnected() {
Log.d(tag, "_____setUiConnected")
Log.d(tag, "____setUiConnected")
_uiState.update { currentState ->
currentState.copy(
connected = true,
@@ -59,7 +58,7 @@ class MainViewModel(
}
fun setUiDisconnected() {
Log.d(tag, "_____setUiDisconnected")
Log.d(tag, "____setUiDisconnected")
_uiState.update { currentState ->
currentState.copy(
connected = false,
+4 -4
View File
@@ -178,10 +178,10 @@ pub fn blocking_run_client<'cb, F, S>(
}
let mut guard = LAST_PING.lock().await;
let Some(last_ping) = *guard else {
warn!("client has not been pinged yet - shutting down");
*guard = None;
stop_and_reset_shutdown_handle().await;
break;
warn!("client has not been pinged yet - shutting down");
*guard = None;
stop_and_reset_shutdown_handle().await;
break;
};
if last_ping.elapsed() > Duration::from_secs(10) {
warn!("client has not been pinged for more than 10 seconds - shutting down");