Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JFreegman/toxcore
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1eb0d6a37e971f40f8f9b8830cd5c6e3208cfab
Choose a base ref
..
head repository: JFreegman/toxcore
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 02996f06850fb565fa5520cb4e1daa8c616b41c1
Choose a head ref
Showing with 6 additions and 2 deletions.
  1. +1 −1 toxcore/group_chats.c
  2. +5 −1 toxcore/group_pack.c
2 changes: 1 addition & 1 deletion toxcore/group_chats.c
View file
Original file line number Diff line number Diff line change
@@ -5773,7 +5773,7 @@ static int handle_gc_handshake_request(GC_Chat *chat, const IP_Port *ipp, const

set_sig_pk(gconn->addr.public_key, public_sig_key);

if (join_type == GI_PUBLIC && !is_public_chat(chat)) {
if (join_type == HJ_PUBLIC && !is_public_chat(chat)) {
gcc_mark_for_deletion(gconn, chat->tcp_conn, GC_EXIT_TYPE_DISCONNECTED, nullptr, 0);
return -1;
}
6 changes: 5 additions & 1 deletion toxcore/group_pack.c
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,11 @@ static bool load_unpack_state_values(GC_Chat *chat, Bin_Unpack *bu)
chat->connection_state = manually_disconnected ? CS_DISCONNECTED : CS_CONNECTING;
chat->shared_state.privacy_state = (Group_Privacy_State)privacy_state;
chat->shared_state.voice_state = (Group_Voice_State)voice_state;
chat->join_type = chat->shared_state.privacy_state == GI_PUBLIC ? HJ_PUBLIC : HJ_PRIVATE;

// we always load saved groups as private in case the group became private while we were offline.
// this will have no detrimental effect if the group is public, as the correct privacy
// state will be set via sync.
chat->join_type = HJ_PRIVATE;

return true;
}