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

Jump to bottom

update to kotlin 2.0.20 and some smaller cosmetic changes #287

Merged
merged 3 commits into from
Aug 23, 2024
Merged

update to kotlin 2.0.20 and some smaller cosmetic changes #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b8eee0
less verbose
zoff99 Aug 23, 2024
0555a32
dont log push url
zoff99 Aug 23, 2024
22f48ca
update to kotlin.version 2.0.20
zoff99 Aug 23, 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
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/main/java/com/zoffcc/applications/trifa/HelperFriend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static boolean friend_do_actual_weburl_call(final String friend_pubkey, final St

try {
HttpResponse<String> 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) {
Expand Down
20 changes: 10 additions & 10 deletions src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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)
Expand Down Expand Up @@ -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())
Expand All @@ -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)
Expand Down Expand Up @@ -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())
Expand Down
Loading