forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from e29e185c03..f1df709b87
f1df709b87 feat: add ngc events 1b6c907235 refactor: Make event dispatch ordered by receive time. b7f9367f6f test: Upgrade cppcheck, fix some warnings. 766e62bc89 chore: Use `pkg_search_module` directly in cmake. 00ff078f91 cleanup: Use target_link_libraries directly in cmake. c58928cc89 chore: Add `IMPORTED_TARGET` to pkg-config packages. 895a6af122 cleanup: Remove NaCl support. 41dfb1c1c0 fix: unpack enum function names in event impl generator 447666d1a1 chore: Disable targets for cross-compilation. 572924e924 chore: Build a docker image with coverage info in it. 415cb78f5e cleanup: Some portability/warning fixes for Windows builds. 425216d9ec fix: Correct a use-after-free and fix some memory leaks. 4b1cfa3e08 refactor: Change all enum-like `#define` sequences into enums. d3c2704fa9 chore: Fix make_single_file to support core-only. 0ce46b644e refactor: Change the `TCP_PACKET_*` defines into an enum. 22cd38ad50 adopt event impl generation tool to #2392 f31ea1088a add the event impl generation tool 4e603bb613 refactor: Use `enum-from-int` rule from tokstyle. 19d8f180d6 chore: Update github actions `uses`. 6a895be0c7 test: Make esp32 build actually try to instantiate tox. 65d09c9bfb cleanup: Remove test net support. REVERT: e29e185c03 feat: add ngc events git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: f1df709b8792da4c0e946d826b11df77d565064d
This commit is contained in:
@ -18,29 +18,48 @@
|
||||
#include "ccompat.h"
|
||||
#include "util.h"
|
||||
|
||||
Group_Privacy_State group_privacy_state_from_int(uint8_t value)
|
||||
bool group_privacy_state_from_int(uint8_t value, Group_Privacy_State *out)
|
||||
{
|
||||
switch (value) {
|
||||
case 0:
|
||||
return GI_PUBLIC;
|
||||
case 1:
|
||||
return GI_PRIVATE;
|
||||
default:
|
||||
return GI_PUBLIC;
|
||||
case GI_PUBLIC: {
|
||||
*out = GI_PUBLIC;
|
||||
return true;
|
||||
}
|
||||
|
||||
case GI_PRIVATE: {
|
||||
*out = GI_PRIVATE;
|
||||
return true;
|
||||
}
|
||||
|
||||
default: {
|
||||
*out = GI_PUBLIC;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Group_Voice_State group_voice_state_from_int(uint8_t value)
|
||||
bool group_voice_state_from_int(uint8_t value, Group_Voice_State *out)
|
||||
{
|
||||
switch (value) {
|
||||
case 0:
|
||||
return GV_ALL;
|
||||
case 1:
|
||||
return GV_MODS;
|
||||
case 2:
|
||||
return GV_FOUNDER;
|
||||
default:
|
||||
return GV_ALL;
|
||||
case GV_ALL: {
|
||||
*out = GV_ALL;
|
||||
return true;
|
||||
}
|
||||
|
||||
case GV_MODS: {
|
||||
*out = GV_MODS;
|
||||
return true;
|
||||
}
|
||||
|
||||
case GV_FOUNDER: {
|
||||
*out = GV_FOUNDER;
|
||||
return true;
|
||||
}
|
||||
|
||||
default: {
|
||||
*out = GV_ALL;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -69,8 +88,8 @@ 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_from_int(privacy_state);
|
||||
chat->shared_state.voice_state = group_voice_state_from_int(voice_state);
|
||||
group_privacy_state_from_int(privacy_state, &chat->shared_state.privacy_state);
|
||||
group_voice_state_from_int(voice_state, &chat->shared_state.voice_state);
|
||||
|
||||
// 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
|
||||
|
Reference in New Issue
Block a user