Skip to content

Commit c4fc83a

Browse files
committed
check for null before trying to send messages
1 parent df3cd9a commit c4fc83a

File tree

1 file changed

+40
-35
lines changed
  • src/main/kotlin/com/zoffcc/applications/trifa2

1 file changed

+40
-35
lines changed

src/main/kotlin/com/zoffcc/applications/trifa2/ChatApp.kt

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,12 @@ fun ChatApp(focusRequester: FocusRequester, displayTextField: Boolean = true, se
427427
Box(Modifier.weight(1f)) {
428428
SendMessage(focusRequester, selectedContactPubkey) { text -> //
429429
Log.i(TAG, "selectedContactPubkey=" + selectedContactPubkey)
430-
if (!send_message_onclick(text, selectedContactPubkey))
430+
if (selectedContactPubkey != null)
431431
{
432-
SnackBarToast("Sending Message failed")
432+
if (!send_message_onclick(text, selectedContactPubkey))
433+
{
434+
SnackBarToast("Sending Message failed")
435+
}
433436
}
434437
}
435438
}
@@ -575,45 +578,47 @@ fun GroupApp(focusRequester: FocusRequester, displayTextField: Boolean = true, s
575578
{
576579
Box(Modifier.weight(1f)) {
577580
GroupSendMessage (focusRequester, selectedGroupId) { text ->
578-
val timestamp = System.currentTimeMillis()
579-
val groupnum: Long = tox_group_by_groupid__wrapper(selectedGroupId!!)
580-
val my_group_peerpk = tox_group_self_get_public_key(groupnum)
581-
val message_id: Long = tox_group_send_message(groupnum, ToxVars.TOX_MESSAGE_TYPE.TOX_MESSAGE_TYPE_NORMAL.value, text)
582-
if (message_id >= 0)
581+
Log.i(TAG, "selectedGroupId=" + selectedGroupId)
582+
if (selectedGroupId != null)
583583
{
584-
var peer_role = -1
585-
try
584+
val timestamp = System.currentTimeMillis()
585+
val groupnum: Long = tox_group_by_groupid__wrapper(selectedGroupId!!)
586+
val my_group_peerpk = tox_group_self_get_public_key(groupnum)
587+
val message_id: Long = tox_group_send_message(groupnum, ToxVars.TOX_MESSAGE_TYPE.TOX_MESSAGE_TYPE_NORMAL.value, text)
588+
if (message_id >= 0)
586589
{
587-
val self_peer_role = MainActivity.tox_group_self_get_role(groupnum)
588-
if (self_peer_role >= 0)
590+
var peer_role = -1
591+
try
592+
{
593+
val self_peer_role = MainActivity.tox_group_self_get_role(groupnum)
594+
if (self_peer_role >= 0)
595+
{
596+
peer_role = self_peer_role
597+
}
598+
} catch (_: Exception)
589599
{
590-
peer_role = self_peer_role
591600
}
592-
} catch (_: Exception)
601+
val message_id_hex = HelperGroup.fourbytes_of_long_to_hex(message_id)
602+
val db_msgid = MainActivity.sent_groupmessage_to_db(groupid = selectedGroupId, message_timestamp = timestamp, group_message = text, message_id = message_id, was_synced = false)
603+
groupmessagestore.send(GroupMessageAction.SendGroupMessage(
604+
UIGroupMessage(
605+
was_synced = false,
606+
is_private_msg = 0,
607+
sentTimeMs = timestamp,
608+
rcvdTimeMs = timestamp,
609+
syncdTimeMs = timestamp,
610+
peer_role = peer_role,
611+
msg_id_hash = "",
612+
message_id_tox = message_id_hex, msgDatabaseId = db_msgid,
613+
user = myUser, timeMs = timestamp, text = text,
614+
toxpk = my_group_peerpk,
615+
groupId = selectedGroupId!!.lowercase(),
616+
trifaMsgType = TRIFAGlobals.TRIFA_MSG_TYPE.TRIFA_MSG_TYPE_TEXT.value,
617+
filename_fullpath = null)))
618+
} else
593619
{
620+
SnackBarToast("Sending Group Message failed")
594621
}
595-
596-
val message_id_hex = HelperGroup.fourbytes_of_long_to_hex(message_id)
597-
val db_msgid = MainActivity.sent_groupmessage_to_db(groupid = selectedGroupId, message_timestamp = timestamp, group_message = text, message_id = message_id, was_synced = false)
598-
groupmessagestore.send(GroupMessageAction.SendGroupMessage(
599-
UIGroupMessage(
600-
was_synced = false,
601-
is_private_msg = 0,
602-
sentTimeMs = timestamp,
603-
rcvdTimeMs = timestamp,
604-
syncdTimeMs = timestamp,
605-
peer_role = peer_role,
606-
msg_id_hash = "",
607-
message_id_tox = message_id_hex, msgDatabaseId = db_msgid,
608-
user = myUser, timeMs = timestamp, text = text,
609-
toxpk = my_group_peerpk,
610-
groupId = selectedGroupId!!.lowercase(),
611-
trifaMsgType = TRIFAGlobals.TRIFA_MSG_TYPE.TRIFA_MSG_TYPE_TEXT.value,
612-
filename_fullpath = null)))
613-
}
614-
else
615-
{
616-
SnackBarToast("Sending Group Message failed")
617622
}
618623
}
619624
}

0 commit comments

Comments
 (0)