android: network observer (#3992)

* android: network observer * removed unused code * rename * rename * new line * rename * changes in logic * adapted to ios logic * change * change * change * networkLost * item in settings * reorder * changes --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>
2024-12-17 17:20:21 +01:00 · 2024-04-11 19:26:24 +07:00
parent 34dee32def
commit b84ef0ce35
10 changed files with 165 additions and 6 deletions
@@ -118,6 +118,7 @@ object ChatModel {
  val simplexLinkMode by lazy { mutableStateOf(ChatController.appPrefs.simplexLinkMode.get()) }

  val clipboardHasText = mutableStateOf(false)
+  val networkInfo = mutableStateOf(UserNetworkInfo(networkType = UserNetworkType.OTHER, online = true))

  val updatingChatsMutex: Mutex = Mutex()
  val changingActiveUserMutex: Mutex = Mutex()
@@ -358,6 +358,8 @@ object ChatController {
  var lastMsgReceivedTimestamp: Long = System.currentTimeMillis()
    private set

+  fun hasChatCtrl() = ctrl != -1L && ctrl != null
+
  private suspend fun currentUserId(funcName: String): Long = changingActiveUserMutex.withLock {
    val userId = chatModel.currentUser.value?.userId
    if (userId == null) {
@@ -879,6 +881,9 @@ object ChatController {
    }
  }

+  suspend fun apiSetNetworkInfo(networkInfo: UserNetworkInfo): Boolean =
+    sendCommandOkResp(null, CC.APISetNetworkInfo(networkInfo))
+
  suspend fun apiSetMemberSettings(rh: Long?, groupId: Long, groupMemberId: Long, memberSettings: GroupMemberSettings): Boolean =
    sendCommandOkResp(rh, CC.ApiSetMemberSettings(groupId, groupMemberId, memberSettings))

@@ -2413,6 +2418,7 @@ sealed class CC {
  class APIGetChatItemTTL(val userId: Long): CC()
  class APISetNetworkConfig(val networkConfig: NetCfg): CC()
  class APIGetNetworkConfig: CC()
+  class APISetNetworkInfo(val networkInfo: UserNetworkInfo): CC()
  class APISetChatSettings(val type: ChatType, val id: Long, val chatSettings: ChatSettings): CC()
  class ApiSetMemberSettings(val groupId: Long, val groupMemberId: Long, val memberSettings: GroupMemberSettings): CC()
  class APIContactInfo(val contactId: Long): CC()
@@ -2555,6 +2561,7 @@ sealed class CC {
    is APIGetChatItemTTL -> "/_ttl $userId"
    is APISetNetworkConfig -> "/_network ${json.encodeToString(networkConfig)}"
    is APIGetNetworkConfig -> "/network"
+    is APISetNetworkInfo -> "/_network info ${json.encodeToString(networkInfo)}"
    is APISetChatSettings -> "/_settings ${chatRef(type, id)} ${json.encodeToString(chatSettings)}"
    is ApiSetMemberSettings -> "/_member settings #$groupId $groupMemberId ${json.encodeToString(memberSettings)}"
    is APIContactInfo -> "/_info @$contactId"
@@ -2692,6 +2699,7 @@ sealed class CC {
    is APIGetChatItemTTL -> "apiGetChatItemTTL"
    is APISetNetworkConfig -> "apiSetNetworkConfig"
    is APIGetNetworkConfig -> "apiGetNetworkConfig"
+    is APISetNetworkInfo -> "apiSetNetworkInfo"
    is APISetChatSettings -> "apiSetChatSettings"
    is ApiSetMemberSettings -> "apiSetMemberSettings"
    is APIContactInfo -> "apiContactInfo"
@@ -5531,3 +5539,26 @@ enum class AppSettingsLockScreenCalls {
      }
  }
 }
+
+@Serializable
+data class UserNetworkInfo(
+  val networkType: UserNetworkType,
+  val online: Boolean,
+)
+
+enum class UserNetworkType {
+  @SerialName("none") NONE,
+  @SerialName("cellular") CELLULAR,
+  @SerialName("wifi") WIFI,
+  @SerialName("ethernet") ETHERNET,
+  @SerialName("other") OTHER;
+
+  val text: String
+    get() = when (this) {
+      NONE -> generalGetString(MR.strings.network_type_no_network_connection)
+      CELLULAR -> generalGetString(MR.strings.network_type_cellular)
+      WIFI -> generalGetString(MR.strings.network_type_network_wifi)
+      ETHERNET -> generalGetString(MR.strings.network_type_ethernet)
+      OTHER -> generalGetString(MR.strings.network_type_other)
+    }
+}
@@ -9,7 +9,6 @@ import chat.simplex.common.views.helpers.DatabaseUtils.randomDatabasePassword
 import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.res.MR
 import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
 import java.io.File
 import java.nio.ByteBuffer

@@ -88,6 +87,7 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
      Log.d(TAG, "Unable to migrate successfully: $res")
      return
    }
+    platform.androidRestartNetworkObserver()
    controller.apiSetTempFolder(coreTmpDir.absolutePath)
    controller.apiSetFilesFolder(appFilesDir.absolutePath)
    if (appPlatform.isDesktop) {
@@ -23,6 +23,7 @@ interface PlatformInterface {
  fun androidStartCallActivity(acceptCall: Boolean, remoteHostId: Long? = null, chatId: ChatId? = null) {}
  fun androidPictureInPictureAllowed(): Boolean = true
  fun androidCallEnded() {}
+  fun androidRestartNetworkObserver() {}
  @Composable fun androidLockPortraitOrientation() {}
  suspend fun androidAskToAllowBackgroundCalls(): Boolean = true
  @Composable fun desktopScrollBarComponents(): Triple<Animatable<Float, AnimationVector1D>, Modifier, MutableState<Job>> = remember { Triple(Animatable(0f), Modifier, mutableStateOf(Job())) }
@@ -15,7 +15,6 @@ import chat.simplex.res.MR
 import com.charleskorn.kaml.decodeFromStream
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import java.io.*
 import java.net.URI
@@ -2,6 +2,7 @@ package chat.simplex.common.views.usersettings

 import SectionBottomSpacer
 import SectionCustomFooter
+import SectionDividerSpaced
 import SectionItemView
 import SectionItemWithValue
 import SectionView
@@ -21,12 +22,12 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.input.*
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.platform.ColumnWithScrollBar
-import chat.simplex.common.platform.chatModel
+import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.ClickableText
 import chat.simplex.common.views.helpers.*
@@ -190,6 +191,16 @@ fun NetworkAndServersView() {
    SectionView(generalGetString(MR.strings.settings_section_title_calls)) {
      SettingsActionItem(painterResource(MR.images.ic_electrical_services), stringResource(MR.strings.webrtc_ice_servers), { ModalManager.start.showModal { RTCServersView(m) } })
    }
+
+    if (appPlatform.isAndroid) {
+      SectionDividerSpaced()
+      SectionView(generalGetString(MR.strings.settings_section_title_network_connection).uppercase()) {
+        val info = remember { chatModel.networkInfo }.value
+        SettingsActionItemWithContent(icon = null, info.networkType.text) {
+          Icon(painterResource(MR.images.ic_circle_filled), stringResource(MR.strings.icon_descr_server_status_connected), tint = if (info.online) Color.Green else MaterialTheme.colors.error)
+        }
+      }
+    }
    SectionBottomSpacer()
  }
 }
@@ -1017,6 +1017,7 @@
  <string name="settings_section_title_themes">THEMES</string>
  <string name="settings_section_title_messages">MESSAGES AND FILES</string>
  <string name="settings_section_title_calls">CALLS</string>
+  <string name="settings_section_title_network_connection">Network connection</string>
  <string name="settings_section_title_incognito">Incognito mode</string>
  <string name="settings_section_title_experimenta">EXPERIMENTAL</string>
  <string name="settings_section_title_use_from_desktop">Use from desktop</string>
@@ -1925,4 +1926,11 @@
  <string name="migrate_from_device_check_connection_and_try_again">Check your internet connection and try again</string>
  <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>Warning</b>: the archive will be deleted.]]></string>
  <string name="migrate_from_device_error_verifying_passphrase">Error verifying passphrase:</string>
+
+<!-- NetworkObserver.kt -->
+  <string name="network_type_no_network_connection">No network connection</string>
+  <string name="network_type_cellular">Cellular</string>
+  <string name="network_type_network_wifi">WiFi</string>
+  <string name="network_type_ethernet">Wired ethernet</string>
+  <string name="network_type_other">Other</string>
 </resources>