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

fix missing peername on sync messages #237

Merged
merged 2 commits into from
Apr 28, 2024
Merged

fix missing peername on sync messages #237

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
3991333
sorma: add more helper functions
zoff99 Apr 28, 2024
0654470
fix missing peername on sync messages
zoff99 Apr 28, 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
12 changes: 12 additions & 0 deletions src/main/java/com/zoffcc/applications/sorm/GroupMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,18 @@ public GroupMessage private_messageBetween(int private_message1, int private_mes
return this;
}

public GroupMessage tox_group_peernameIsNull()
{
this.sql_where = this.sql_where + " and tox_group_peername IS NULL ";
return this;
}

public GroupMessage tox_group_peernameIsNotNull()
{
this.sql_where = this.sql_where + " and tox_group_peername IS NOT NULL ";
return this;
}

public GroupMessage tox_group_peernameEq(String tox_group_peername)
{
this.sql_where = this.sql_where + " and tox_group_peername=?" + (BINDVAR_OFFSET_WHERE + bind_where_count) + " ";
Expand Down
63 changes: 61 additions & 2 deletions src/main/java/com/zoffcc/applications/trifa/HelperGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
import java.util.Iterator;
import java.util.Random;

import static com.zoffcc.applications.ffmpegav.AVActivity.bytesToHex;
import static com.zoffcc.applications.trifa.HelperFiletransfer.get_incoming_filetransfer_local_filename;
import static com.zoffcc.applications.trifa.HelperFiletransfer.save_group_incoming_file;
import static com.zoffcc.applications.trifa.HelperGeneric.getHexArray;
import static com.zoffcc.applications.trifa.HelperGeneric.long_date_time_format;
import static com.zoffcc.applications.trifa.MainActivity.*;
import static com.zoffcc.applications.trifa.MainActivity.tox_group_peer_get_name;
import static com.zoffcc.applications.trifa.TRIFAGlobals.*;
Expand Down Expand Up @@ -1380,11 +1378,72 @@ static GroupMessage get_last_group_message_in_this_group_within_n_seconds_from_s
}
}

public static void update_group_peername_in_all_missing_messages(final String group_identifier,
final String peer_pubkey, final String peer_name)
{
try
{
TrifaToxService.Companion.getOrma().updateGroupMessage()
.group_identifierEq(group_identifier)
.tox_group_peer_pubkeyEq(peer_pubkey)
.tox_group_peernameEq("")
.tox_group_peername(peer_name)
.execute();
}
catch (Exception e)
{
// e.printStackTrace();
}

try
{
TrifaToxService.Companion.getOrma().updateGroupMessage()
.group_identifierEq(group_identifier)
.tox_group_peer_pubkeyEq(peer_pubkey)
.tox_group_peernameIsNull()
.tox_group_peername(peer_name)
.execute();
}
catch (Exception e)
{
// e.printStackTrace();
}
}

public static String group_get_last_know_peername(final String group_identifier, final String peer_pubkey)
{
try
{
final String last_know_peername = TrifaToxService.Companion.getOrma()
.selectFromGroupMessage()
.group_identifierEq(group_identifier)
.tox_group_peer_pubkeyEq(peer_pubkey)
.tox_group_peernameNotEq("")
.orderBySent_timestampAsc()
.limit(1).toList()
.get(0)
.tox_group_peername;
Log.i(TAG, "last_know_peername=" + last_know_peername);
return last_know_peername;
}
catch (Exception e)
{
// e.printStackTrace();
}
return null;
}

static void group_message_add_from_sync(final String group_identifier, final String syncer_pubkey,
long peer_number2, String peer_pubkey, int a_TOX_MESSAGE_TYPE,
String message, long length, long sent_timestamp_in_ms,
String message_id, int sync_type, final String peer_name)
{
// HINT: if peername is null or empty, lets try to get the last know peername from this groups messages
if ((peer_name == null) || (peer_name.length() < 1))
{
final String last_know_peername = group_get_last_know_peername(group_identifier, peer_pubkey);
}

// Log.i(TAG,
// "group_message_add_from_sync:cf_num=" + group_identifier + " pnum=" + peer_number2 + " msg=" + message);

Expand Down
14 changes: 14 additions & 0 deletions src/main/kotlin/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ import com.zoffcc.applications.trifa.SqliteEscapeLikeString
import com.zoffcc.applications.trifa.HelperGeneric.PubkeyShort
import com.zoffcc.applications.trifa.HelperGeneric.ngc_video_frame_last_incoming_ts
import com.zoffcc.applications.trifa.HelperGroup
import com.zoffcc.applications.trifa.HelperGroup.group_get_last_know_peername
import com.zoffcc.applications.trifa.HelperGroup.update_group_peername_in_all_missing_messages
import com.zoffcc.applications.trifa.HelperNotification.init_system_tray
import com.zoffcc.applications.trifa.HelperNotification.set_resouces_dir
import com.zoffcc.applications.trifa.JPictureBox
Expand Down Expand Up @@ -1474,6 +1476,18 @@ fun load_groupmessages(selectedGroupId: String?)
}
}

if (it.tox_group_peername.isNullOrEmpty())
{
// we still do not have a peername for this message, try to get it from previous messages in this group
val last_know_peername = group_get_last_know_peername(it.group_identifier, it.tox_group_peer_pubkey)
if (!last_know_peername.isNullOrEmpty())
{
it.tox_group_peername = last_know_peername
// Log.i(TAG, "load_groupmessages:msg id of missing name:" + it.id)
update_group_peername_in_all_missing_messages(it.group_identifier, it.tox_group_peer_pubkey, it.tox_group_peername)
}
}

val friend_user = User(it.tox_group_peername + " / " + PubkeyShort(it.tox_group_peer_pubkey), picture = "friend_avatar.png", toxpk = it.tox_group_peer_pubkey.uppercase(), color = ColorProvider.getColor(true, it.tox_group_peer_pubkey.uppercase()))
when (it.TRIFA_MESSAGE_TYPE)
{
Expand Down
Loading