Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

less verbose #276

Merged
merged 2 commits into from
Jul 29, 2024
Merged

less verbose #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29f116c
less verbose debug messages
zoff99 Jul 28, 2024
2a11301
less verbose
zoff99 Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/kotlin/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ fun App()
LaunchedEffect(contacts.selectedContactPubkey) {
// HINT: focus on the message input field
focusRequester.requestFocus()
Log.i(TAG, "FFFFFF1111111111111: focus on the message input field")
// Log.i(TAG, "FFFFFF1111111111111: focus on the message input field")
contactstore.messageresetFilter()
}
}
Expand Down Expand Up @@ -1261,7 +1261,7 @@ fun App()
LaunchedEffect(groups.selectedGroupId) {
// HINT: focus on the group message input field
groupfocusRequester.requestFocus()
Log.i(TAG, "FFFFgg1111111111111: focus on the group message input field")
// Log.i(TAG, "FFFFgg1111111111111: focus on the group message input field")
groupstore.groupmessageresetFilter()
}
}
Expand Down Expand Up @@ -1417,7 +1417,7 @@ fun load_groupmessages(selectedGroupId: String?)
{
if (selectedGroupId != null)
{
Log.i(TAG, "load_groupmessages")
// Log.i(TAG, "load_groupmessages")
try
{
val groupid = selectedGroupId.lowercase()
Expand Down
56 changes: 28 additions & 28 deletions src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,7 +1717,7 @@ class MainActivity
@Suppress("unused")
fun android_tox_callback_friend_read_receipt_cb_method(friend_number: Long, message_id: Long)
{
Log.i(TAG, "friend_read_receipt:friend_number=" + friend_number + " message_id=" + message_id)
// Log.i(TAG, "friend_read_receipt:friend_number=" + friend_number + " message_id=" + message_id)
try
{
val toxpk = tox_friend_get_public_key(friend_number)!!.uppercase()
Expand All @@ -1737,15 +1737,15 @@ class MainActivity
val m = orma!!.selectFromMessage().message_idEq(message_id).
tox_friendpubkeyEq(toxpk).directionEq(1).orderByIdDesc().toList()[0]
// there can be older messages with same message_id for this friend! so always take the latest one! -------
Log.i(TAG, "friend_read_receipt:m=" + m)
Log.i(TAG, "friend_read_receipt:m:message_id=" + m.message_id + " text=" + m.text + " friendpubkey=" + m.tox_friendpubkey + " read=" + m.read + " direction=" + m.direction)
// Log.i(TAG, "friend_read_receipt:m=" + m)
// Log.i(TAG, "friend_read_receipt:m:message_id=" + m.message_id + " text=" + m.text + " friendpubkey=" + m.tox_friendpubkey + " read=" + m.read + " direction=" + m.direction)
if (m != null)
{
m.rcvd_timestamp = System.currentTimeMillis()
m.read = true
Log.i(TAG,
"friend_read_receipt:friend:" + get_friend_name_from_num(friend_number) + " message:" + m.text +
" m=" + m)
// Log.i(TAG,
// "friend_read_receipt:friend:" + get_friend_name_from_num(friend_number) + " message:" + m.text +
// " m=" + m)
update_message_in_db_read_rcvd_timestamp_rawmsgbytes(m)
// update message in UI
modify_text_message(m)
Expand Down Expand Up @@ -1963,7 +1963,7 @@ class MainActivity
catch(_: Exception)
{
}
Log.i(TAG, "TOX_FILE_KIND_MESSAGEV2:MSGv2HASH:2=" + msg_id_as_hex_string)
// Log.i(TAG, "TOX_FILE_KIND_MESSAGEV2:MSGv2HASH:2=" + msg_id_as_hex_string)

val already_have_message = orma!!.selectFromMessage().tox_friendpubkeyEq(toxpk).
msg_id_hashEq(msg_id_as_hex_string).count()
Expand Down Expand Up @@ -2026,28 +2026,28 @@ class MainActivity
raw_message_buf.put(raw_message, 0, raw_message_length.toInt())
val msg_sec = tox_messagev2_get_ts_sec(raw_message_buf)
val msg_ms = tox_messagev2_get_ts_ms(raw_message_buf)
Log.i(TAG, "friend_sync_message_v2_cb:sec=" + msg_sec + " ms=" + msg_ms);
// Log.i(TAG, "friend_sync_message_v2_cb:sec=" + msg_sec + " ms=" + msg_ms);
val msg_id_buffer = ByteBuffer.allocateDirect(TOX_HASH_LENGTH)
tox_messagev2_get_message_id(raw_message_buf, msg_id_buffer)
val msg_id_buffer_compat = ByteBufferCompat(msg_id_buffer)
val msg_id_as_hex_string = bytesToHex(msg_id_buffer_compat.array()!!,
msg_id_buffer_compat.arrayOffset(),
msg_id_buffer_compat.limit())
Log.i(TAG, "friend_sync_message_v2_cb:MSGv2HASH=" + msg_id_as_hex_string)
// Log.i(TAG, "friend_sync_message_v2_cb:MSGv2HASH=" + msg_id_as_hex_string)
val real_sender_as_hex_string = tox_messagev2_get_sync_message_pubkey(raw_message_buf)
Log.i(TAG, "friend_sync_message_v2_cb:real sender pubkey=" + real_sender_as_hex_string + " " +
get_friend_name_from_pubkey(real_sender_as_hex_string))
// Log.i(TAG, "friend_sync_message_v2_cb:real sender pubkey=" + real_sender_as_hex_string + " " +
// get_friend_name_from_pubkey(real_sender_as_hex_string))
val msgv2_type = tox_messagev2_get_sync_message_type(raw_message_buf)
Log.i(TAG, "friend_sync_message_v2_cb:msg type=" +
ToxVars.TOX_FILE_KIND.value_str(msgv2_type.toInt()))
// Log.i(TAG, "friend_sync_message_v2_cb:msg type=" +
// ToxVars.TOX_FILE_KIND.value_str(msgv2_type.toInt()))
val msg_id_buffer_wrapped = ByteBuffer.allocateDirect(TOX_HASH_LENGTH)
tox_messagev2_get_message_id(raw_message_buf_wrapped, msg_id_buffer_wrapped)
val msg_id_buffer_wrapped_compat = ByteBufferCompat(msg_id_buffer_wrapped)
val msg_id_as_hex_string_wrapped = bytesToHex(msg_id_buffer_wrapped_compat.array()!!,
msg_id_buffer_wrapped_compat.arrayOffset(),
msg_id_buffer_wrapped_compat.limit())
Log.i(TAG, "friend_sync_message_v2_cb:MSGv2HASH=" + msg_id_as_hex_string_wrapped + " len=" +
msg_id_as_hex_string_wrapped.length)
// Log.i(TAG, "friend_sync_message_v2_cb:MSGv2HASH=" + msg_id_as_hex_string_wrapped + " len=" +
// msg_id_as_hex_string_wrapped.length)

if (msgv2_type.toInt() == ToxVars.TOX_FILE_KIND.TOX_FILE_KIND_MESSAGEV2_SEND.value)
{
Expand All @@ -2069,7 +2069,7 @@ class MainActivity
{
val msg_wrapped_sec = tox_messagev2_get_ts_sec(raw_message_buf_wrapped)
val msg_wrapped_ms = tox_messagev2_get_ts_ms(raw_message_buf_wrapped)
Log.i(TAG, "friend_sync_message_v2_cb:sec=" + msg_wrapped_sec + " ms=" + msg_wrapped_ms);
// Log.i(TAG, "friend_sync_message_v2_cb:sec=" + msg_wrapped_sec + " ms=" + msg_wrapped_ms);
val msg_text_buffer_wrapped = ByteBuffer.allocateDirect(raw_data_length.toInt())
val text_length = tox_messagev2_get_message_text(raw_message_buf_wrapped,
raw_data_length, 0, 0,
Expand All @@ -2089,9 +2089,9 @@ class MainActivity
val msg_text_as_hex_string_wrapped = bytesToHex(msg_text_buffer_wrapped_compat.array()!!,
msg_text_buffer_wrapped_compat.arrayOffset(),
msg_text_buffer_wrapped_compat.limit())
Log.i(TAG, "friend_sync_message_v2_cb:len=" + text_length + " wrapped msg text str=" +
wrapped_msg_text_as_string)
Log.i(TAG, "friend_sync_message_v2_cb:wrapped msg text hex=" + msg_text_as_hex_string_wrapped)
// Log.i(TAG, "friend_sync_message_v2_cb:len=" + text_length + " wrapped msg text str=" +
// wrapped_msg_text_as_string)
// Log.i(TAG, "friend_sync_message_v2_cb:wrapped msg text hex=" + msg_text_as_hex_string_wrapped)

try
{
Expand Down Expand Up @@ -2129,11 +2129,11 @@ class MainActivity
real_conference_id, real_sender_peer_pubkey, sync_msg_received_timestamp,
real_send_message_id, MESSAGE_GROUP_HISTORY_SYNC_DOUBLE_INTERVAL_SECS.toLong(), real_sender_text)

Log.i(TAG, "m.message_id_tox=" + real_send_message_id)
// Log.i(TAG, "m.message_id_tox=" + real_send_message_id)

if (gm != null)
{
Log.i(TAG, "friend_sync_message_v2_cb:potentially double message:2")
// Log.i(TAG, "friend_sync_message_v2_cb:potentially double message:2")
// ok it's a "potentially" double message
// just ignore it, but still send "receipt" to proxy so it won't send this message again
send_friend_msg_receipt_v2_wrapper(friend_number, 3, msg_id_buffer,
Expand Down Expand Up @@ -2161,7 +2161,7 @@ class MainActivity
if (peer_name.isNullOrEmpty())
{
// TODO: get peer name from ?? somewhere
Log.i(TAG, "sync_messagev2_send: WARNING: we do not have a peer name")
// Log.i(TAG, "sync_messagev2_send: WARNING: we do not have a peer name")
}

HelperGroup.group_message_add_from_sync(real_conference_id, syncer_pubkey,
Expand All @@ -2179,7 +2179,7 @@ class MainActivity
{
// sync message from unkown original sender (or conference, which is not implemented in this client)
// still send "receipt" to our relay, or else it will send us this message forever
Log.i(TAG, "friend_sync_message_v2_cb:send receipt for unknown message");
// Log.i(TAG, "friend_sync_message_v2_cb:send receipt for unknown message");
send_friend_msg_receipt_v2_wrapper(friend_number, 4, msg_id_buffer,
(System.currentTimeMillis() / 1000))
}
Expand Down Expand Up @@ -2219,12 +2219,12 @@ class MainActivity

val ts_sec = tox_messagev2_get_ts_sec(raw_message_buf)
val ts_ms = tox_messagev2_get_ts_ms(raw_message_buf)
Log.i(TAG, "receive_incoming_message:TOX_FILE_KIND_MESSAGEV2_SEND:raw_msg=" + bytes_to_hex(raw_message))
// Log.i(TAG, "receive_incoming_message:TOX_FILE_KIND_MESSAGEV2_SEND:raw_msg=" + bytes_to_hex(raw_message))

val msg_id_as_hex_string = bytesToHex(msg_id_buffer_compat.array()!!,
msg_id_buffer_compat.arrayOffset(),
msg_id_buffer_compat.limit())
Log.i(TAG, "receive_incoming_message:TOX_FILE_KIND_MESSAGEV2_SEND:MSGv2HASH:2=$msg_id_as_hex_string")
// Log.i(TAG, "receive_incoming_message:TOX_FILE_KIND_MESSAGEV2_SEND:MSGv2HASH:2=$msg_id_as_hex_string")

val already_have_message: Int = orma!!.selectFromMessage()
.tox_friendpubkeyEq(tox_friend_get_public_key(friend_number_real_sender))
Expand Down Expand Up @@ -2268,7 +2268,7 @@ class MainActivity
}

if (fname.isNullOrEmpty()) {
Log.i(TAG, "receive_incoming_message:WARNING:we do not have a friend name")
// Log.i(TAG, "receive_incoming_message:WARNING:we do not have a friend name")
}

val friend_user = User(fname!!, picture = "friend_avatar.png", toxpk = original_sender_pubkey)
Expand Down Expand Up @@ -2301,7 +2301,7 @@ class MainActivity
msg_id_buffer.put(msg_id, 0, TOX_HASH_LENGTH)
val msg_id_buffer_compat = ByteBufferCompat(msg_id_buffer)
val message_id_hash_as_hex_string = bytesToHex(msg_id_buffer_compat.array()!!, msg_id_buffer_compat.arrayOffset(), msg_id_buffer_compat.limit())
Log.i(TAG, "receipt_message_v2_cb:MSGv2HASH:2=" + message_id_hash_as_hex_string)
// Log.i(TAG, "receipt_message_v2_cb:MSGv2HASH:2=" + message_id_hash_as_hex_string)

try
{
Expand Down Expand Up @@ -2910,7 +2910,7 @@ class MainActivity
if (f.kind == ToxVars.TOX_FILE_KIND.TOX_FILE_KIND_AVATAR.value)
{
val avatar_chunk_hex = bytesToHex(data!!, 0, length.toInt()).uppercase()
Log.i(TAG, "callback_file_recv_chunk_cb:incoming avatar chunk: " + position + " " + length) // + " " + avatar_chunk_hex)
// Log.i(TAG, "callback_file_recv_chunk_cb:incoming avatar chunk: " + position + " " + length) // + " " + avatar_chunk_hex)
add_friend_avatar_chunk(friend_pk, avatar_chunk_hex, (position == 0L))
}
else
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/zoffcc/applications/trifa/savepathenabled_state.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ fun CoroutineScope.createGlobalStore(): GlobalStore {
.is_newEq(true).count()
if (unread_count > 0)
{
Log.i(TAG, "try_clear_unread_message_count:unread_count=" + unread_count)
// Log.i(TAG, "try_clear_unread_message_count:unread_count=" + unread_count)
}
}
} catch (e: Exception)
Expand Down Expand Up @@ -278,7 +278,7 @@ fun CoroutineScope.createGlobalStore(): GlobalStore {
.is_newEq(true).count()
if (unread_count != 0)
{
Log.i(TAG, "try_clear_unread_group_message_count:unread_count=" + unread_count)
// Log.i(TAG, "try_clear_unread_group_message_count:unread_count=" + unread_count)
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/kotlin/com/zoffcc/applications/trifa2/ChatApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,15 @@ fun ChatAppWithScaffold(focusRequester: FocusRequester, displayTextField: Boolea
LaunchedEffect(contactList.messageFilterActive) {
// HINT: focus on the search input field when search input field is opened
focusRequester2.requestFocus()
Log.i(TAG, "FFFFFF2222222222222: focus on the search input field when search input field is opened")
// Log.i(TAG, "FFFFFF2222222222222: focus on the search input field when search input field is opened")
}
}
else
{
LaunchedEffect(contactList.messageFilterActive) {
// HINT: focus on the message input field, when search input field is closed
focusRequester.requestFocus()
Log.i(TAG, "FFFFFF3333333333333: focus on the message input field, when search input field is closed")
// Log.i(TAG, "FFFFFF3333333333333: focus on the message input field, when search input field is closed")
}
}
Scaffold(topBar = {
Expand Down Expand Up @@ -276,15 +276,15 @@ fun GroupAppWithScaffold(focusRequester: FocusRequester, displayTextField: Boole
LaunchedEffect(groupList.groupmessageFilterActive) {
// HINT: focus on the search input field when search input field is opened
focusRequester2.requestFocus()
Log.i(TAG, "FFFFgg2222222222222: focus on the search input field when search input field is opened")
// Log.i(TAG, "FFFFgg2222222222222: focus on the search input field when search input field is opened")
}
}
else
{
LaunchedEffect(groupList.groupmessageFilterActive) {
// HINT: focus on the message input field, when search input field is closed
focusRequester.requestFocus()
Log.i(TAG, "FFFFgg3333333333333: focus on the group message input field, when search input field is closed")
// Log.i(TAG, "FFFFgg3333333333333: focus on the group message input field, when search input field is closed")
}
}
Scaffold(topBar = {
Expand Down
Loading