From 4b8eee011da094d23c0e2e18b1683117e3c7ae8b Mon Sep 17 00:00:00 2001 From: zoff99 Date: Fri, 23 Aug 2024 13:07:54 +0200 Subject: [PATCH 1/3] less verbose --- .../applications/trifa/TrifaToxService.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt b/src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt index f65d33c4..642a902d 100644 --- a/src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt +++ b/src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt @@ -1055,8 +1055,8 @@ class TrifaToxService val m_resend_v1 = ii.next() m_counter++ - Log.i(TAG, "resend_v3_messages: " + m_counter + ": friend=" - + get_friend_name_from_pubkey(m_resend_v1.tox_friendpubkey) + " text=" + m_resend_v1.text) + // Log.i(TAG, "resend_v3_messages: " + m_counter + ": friend=" + // + get_friend_name_from_pubkey(m_resend_v1.tox_friendpubkey) + " text=" + m_resend_v1.text) } ii = m_v1.iterator() while (ii.hasNext()) @@ -1076,8 +1076,8 @@ class TrifaToxService get_friend_name_from_pubkey(m_resend_v1.tox_friendpubkey)) continue } - Log.i(TAG, "resend_v3_messages:tox_friend_resend_msgv3_wrapper:msg_idv3_hash=" + m_resend_v1.msg_idv3_hash + " text=" + m_resend_v1.text + " : m=" + - m_resend_v1 + " : " + get_friend_name_from_pubkey(m_resend_v1.tox_friendpubkey)); + // Log.i(TAG, "resend_v3_messages:tox_friend_resend_msgv3_wrapper:msg_idv3_hash=" + m_resend_v1.msg_idv3_hash + " text=" + m_resend_v1.text + " : m=" + + // m_resend_v1 + " : " + get_friend_name_from_pubkey(m_resend_v1.tox_friendpubkey)); tox_friend_resend_msgv3_wrapper(m_resend_v1) cur_resend_count_per_iteration++ if (cur_resend_count_per_iteration >= max_resend_count_per_iteration) @@ -1144,8 +1144,8 @@ class TrifaToxService val m_resend_v0 = ii.next() m_counter++ - Log.i(TAG, "resend_old_messages: " + m_counter + ": friend=" - + get_friend_name_from_pubkey(m_resend_v0.tox_friendpubkey) + " text=" + m_resend_v0.text) + // Log.i(TAG, "resend_old_messages: " + m_counter + ": friend=" + // + get_friend_name_from_pubkey(m_resend_v0.tox_friendpubkey) + " text=" + m_resend_v0.text) } ii = m_v0.iterator() while (ii.hasNext()) @@ -1166,8 +1166,8 @@ class TrifaToxService get_friend_name_from_pubkey(m_resend_v0.tox_friendpubkey)) continue } - Log.i(TAG, "resend_old_messages:tox_friend_resend_msgv3_wrapper:" + m_resend_v0.text + " : m=" + - m_resend_v0 + " : " + get_friend_name_from_pubkey(m_resend_v0.tox_friendpubkey)) + // Log.i(TAG, "resend_old_messages:tox_friend_resend_msgv3_wrapper:" + m_resend_v0.text + " : m=" + + // m_resend_v0 + " : " + get_friend_name_from_pubkey(m_resend_v0.tox_friendpubkey)) tox_friend_resend_msgv3_wrapper(m_resend_v0) cur_resend_count_per_iteration++ if (cur_resend_count_per_iteration >= max_resend_count_per_iteration) @@ -1218,8 +1218,8 @@ class TrifaToxService val m_resend_v2 = ii.next() m_counter++ - Log.i(TAG, "resend_v2_messages: " + m_counter + ": friend=" - + get_friend_name_from_pubkey(m_resend_v2.tox_friendpubkey) + " text=" + m_resend_v2.text) + // Log.i(TAG, "resend_v2_messages: " + m_counter + ": friend=" + // + get_friend_name_from_pubkey(m_resend_v2.tox_friendpubkey) + " text=" + m_resend_v2.text) } ii = m_v1.iterator() while (ii.hasNext()) From 0555a32d4cd5d7283010b999faee02353344c831 Mon Sep 17 00:00:00 2001 From: zoff99 Date: Fri, 23 Aug 2024 13:10:29 +0200 Subject: [PATCH 2/3] dont log push url --- src/main/java/com/zoffcc/applications/trifa/HelperFriend.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zoffcc/applications/trifa/HelperFriend.java b/src/main/java/com/zoffcc/applications/trifa/HelperFriend.java index f5c7f07c..fbb2e6cb 100644 --- a/src/main/java/com/zoffcc/applications/trifa/HelperFriend.java +++ b/src/main/java/com/zoffcc/applications/trifa/HelperFriend.java @@ -335,7 +335,7 @@ static boolean friend_do_actual_weburl_call(final String friend_pubkey, final St try { HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); - Log.i(TAG, "friend_call_push_url:url=" + pushurl_for_friend + " RES=" + response.statusCode()); + Log.i(TAG, "friend_call_push_url:url=" + "********" + " RES=" + response.statusCode()); if ((response.statusCode() < 300) && (response.statusCode() > 199)) { if (update_message_flag) { From 22f48ca99bef79f03ac82397169826fc9398de33 Mon Sep 17 00:00:00 2001 From: zoff99 Date: Fri, 23 Aug 2024 14:01:36 +0200 Subject: [PATCH 3/3] update to kotlin.version 2.0.20 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index afd9692c..06daac30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,5 +7,5 @@ android.defaults.buildfeatures.buildconfig=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental compose.version=1.6.11 -kotlin.version=2.0.20-RC2 -multiplatform.version=2.0.20-RC2 +kotlin.version=2.0.20 +multiplatform.version=2.0.20