Zoxcore · zoff99 · Dec 26, 2023 · Dec 25, 2023 · Dec 26, 2023 · Dec 26, 2023
diff --git a/gradle.properties b/gradle.properties
@@ -6,6 +6,6 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 android.defaults.buildfeatures.buildconfig=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-compose.version=1.6.0-dev1347
+compose.version=1.5.11
 kotlin.version=1.9.21
 multiplatform.version=1.9.21
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
@@ -1000,9 +1000,9 @@ fun App()
                                     load_messages_for_friend(contacts.selectedContactPubkey)
                                     GlobalScope.launch { globalstore.try_clear_unread_message_count() }
                                     ChatAppWithScaffold(focusRequester = focusRequester, contactList = contacts, ui_scale = ui_scale)
-                                    LaunchedEffect(contacts.selectedContactPubkey) {
-                                        focusRequester.requestFocus()
-                                    }
+                                    //LaunchedEffect(contacts.selectedContactPubkey) {
+                                    //    focusRequester.requestFocus()
+                                    //}
                                 }
                             }
                         }
@@ -1032,9 +1032,9 @@ fun App()
                                     load_groupmessages_for_friend(groups.selectedGroupId)
                                     GlobalScope.launch { globalstore.try_clear_unread_group_message_count() }
                                     GroupAppWithScaffold(focusRequester = groupfocusRequester, groupList = groups, ui_scale = ui_scale)
-                                    LaunchedEffect(groups.selectedGroupId) {
-                                        groupfocusRequester.requestFocus()
-                                    }
+                                    //LaunchedEffect(groups.selectedGroupId) {
+                                    //    groupfocusRequester.requestFocus()
+                                    //}
                                 }
                             }
                         }

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt b/src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt
@@ -314,13 +314,6 @@ class MainActivity
                 tox_service_fg!!.tox_thread_start_fg()
             }
 
-            try
-            {
-                Thread.currentThread().name = "t_main"
-            } catch (_: Exception)
-            {
-            }
-
             try
             {
                 toxdatastore.updateToxID(my_tox_id_temp)

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt b/src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt
@@ -1,6 +1,7 @@
 package com.zoffcc.applications.trifa
 
 import avstatestore
+import avstatestorecallstate
 import com.zoffcc.applications.sorm.BootstrapNodeEntryDB
 import com.zoffcc.applications.sorm.BootstrapNodeEntryDB.bootstrap_node_list
 import com.zoffcc.applications.sorm.BootstrapNodeEntryDB.get_tcprelay_nodelist_from_db
@@ -83,6 +84,13 @@ class TrifaToxService
         {
             override fun run()
             {
+                try
+                {
+                    Thread.currentThread().name = "t_tox_iter"
+                } catch (_: Exception)
+                {
+                }
+
                 com.zoffcc.applications.sorm.OrmaDatabase.init()
                 // ------ correct startup order ------
                 orma = com.zoffcc.applications.sorm.OrmaDatabase()
@@ -334,6 +342,13 @@ class TrifaToxService
         {
             override fun run()
             {
+                try
+                {
+                    Thread.currentThread().name = "t_a_play"
+                } catch (_: Exception)
+                {
+                }
+
                 try
                 {
                     tox_a_queue_stop_trigger = true
@@ -450,6 +465,10 @@ class TrifaToxService
                         // -- play incoming bytes --
                         // -- play incoming bytes --
                         sleep(20)
+                        if (avstatestorecallstate.state.call_state != AVState.CALL_STATUS.CALL_STATUS_CALLING)
+                        {
+                            sleep(200)
+                        }
                     }
                 } catch (_: Exception)
                 {
@@ -467,6 +486,13 @@ class TrifaToxService
         {
             override fun run()
             {
+                try
+                {
+                    Thread.currentThread().name = "t_ngc_a_play"
+                } catch (_: Exception)
+                {
+                }
+
                 try
                 {
                     val sleep_millis: Long = 40
@@ -607,6 +633,10 @@ class TrifaToxService
                         // -- play incoming bytes --
                         // -- play incoming bytes --
                         sleep(20)
+                        if ((HelperGeneric.ngc_video_packet_last_incoming_ts + 5000) < System.currentTimeMillis())
+                        {
+                            sleep(200)
+                        }
                     }
                 } catch (_: Exception)
                 {

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa/savepathenabled_state.kt b/src/main/kotlin/com/zoffcc/applications/trifa/savepathenabled_state.kt
@@ -19,6 +19,8 @@ data class globalstore_state(
     val contacts_unread_group_message_count: Int = 0
 )
 
+private val globalstore_state_lock = Any()
+
 interface GlobalStore {
     fun updateMinimized(value: Boolean)
     fun updateFocused(value: Boolean)
@@ -72,19 +74,23 @@ fun CoroutineScope.createGlobalStore(): GlobalStore {
 
         override fun try_clear_unread_message_count()
         {
-            var unread_count = 0
-            try
-            {
-                unread_count = TrifaToxService.orma!!.selectFromMessage()
-                    .directionEq(TRIFAGlobals.TRIFA_MSG_DIRECTION.TRIFA_MSG_DIRECTION_RECVD.value)
-                    .is_newEq(true).count()
-                Log.i(TAG, "try_clear_unread_message_count:unread_count=" +  unread_count)
-            }
-            catch (e: Exception)
-            {
-                e.printStackTrace()
+            synchronized(globalstore_state_lock) {
+                var unread_count = 0
+                try
+                {
+                    unread_count = TrifaToxService.orma!!.selectFromMessage()
+                        .directionEq(TRIFAGlobals.TRIFA_MSG_DIRECTION.TRIFA_MSG_DIRECTION_RECVD.value)
+                        .is_newEq(true).count()
+                    if (unread_count > 0)
+                    {
+                        Log.i(TAG, "try_clear_unread_message_count:unread_count=" + unread_count)
+                    }
+                } catch (e: Exception)
+                {
+                    e.printStackTrace()
+                }
+                mutableStateFlow.value = state.copy(contacts_unread_message_count = unread_count)
             }
-            mutableStateFlow.value = state.copy(contacts_unread_message_count = unread_count)
         }
 
         override fun hard_clear_unread_message_count()

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa2/ChatApp.kt b/src/main/kotlin/com/zoffcc/applications/trifa2/ChatApp.kt
@@ -272,18 +272,6 @@ fun ChatApp(focusRequester: FocusRequester, displayTextField: Boolean = true, se
                                     {
                                         SnackBarToast("Sending Message failed")
                                     }
-                                    /*
-                                    val res = tox_friend_send_message(friend_num, TOX_MESSAGE_TYPE.TOX_MESSAGE_TYPE_NORMAL.value, text)
-                                    if (res >= 0)
-                                    {
-                                        val msg_id_db = sent_message_to_db(selectedContactPubkey, timestamp, text)
-                                        messagestore.send(MessageAction.SendMessage(UIMessage(direction = TRIFAGlobals.TRIFA_MSG_DIRECTION.TRIFA_MSG_DIRECTION_SENT.value, user = myUser, timeMs = timestamp, text = text, toxpk = selectedContactPubkey!!, trifaMsgType = TRIFAGlobals.TRIFA_MSG_TYPE.TRIFA_MSG_TYPE_TEXT.value, msgDatabaseId = msg_id_db, filename_fullpath = null)))
-                                    }
-                                    else
-                                    {
-                                        SnackBarToast("Sending Message failed")
-                                    }
-                                    */
                                 }
                             }
                         }

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa2/GroupMessages.kt b/src/main/kotlin/com/zoffcc/applications/trifa2/GroupMessages.kt
@@ -24,9 +24,7 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.zoffcc.applications.trifa.Log
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.painterResource
 
 @Composable
 internal fun GroupMessages(ui_scale: Float, selectedGroupId: String?) {

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa2/Messages.kt b/src/main/kotlin/com/zoffcc/applications/trifa2/Messages.kt
@@ -22,9 +22,7 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.zoffcc.applications.trifa.Log
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.painterResource
 
 @Composable
 internal fun Messages(ui_scale: Float, selectedContactPubkey: String?) {

diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ProfileCircle.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ProfileCircle.kt
@@ -23,7 +23,6 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -33,7 +32,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.painterResource
 
 /**
  * Display the avatar for a [ContactItem]. If it has an avatar image, display that, otherwise