update rmm and load avatar by id
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
This commit is contained in:
parent
e6a86869d9
commit
822b1adbc8
2
external/solanaceae_message3
vendored
2
external/solanaceae_message3
vendored
@ -1 +1 @@
|
|||||||
Subproject commit c8e3e9374360fa241ccebd070e1d70abf6ba665b
|
Subproject commit 7f1a5ea1d40a670e27ae27f54029353daa9eb5ac
|
@ -54,6 +54,7 @@ ToxAvatarManager::ToxAvatarManager(
|
|||||||
{ // scan tox contacts for cached avatars
|
{ // scan tox contacts for cached avatars
|
||||||
// old sts says pubkey.png
|
// old sts says pubkey.png
|
||||||
|
|
||||||
|
#if 0
|
||||||
_cs.registry().view<Contact::Components::ToxFriendPersistent>().each([this](auto c, const Contact::Components::ToxFriendPersistent& tox_pers) {
|
_cs.registry().view<Contact::Components::ToxFriendPersistent>().each([this](auto c, const Contact::Components::ToxFriendPersistent& tox_pers) {
|
||||||
// try
|
// try
|
||||||
addAvatarFileToContact(c, tox_pers.key);
|
addAvatarFileToContact(c, tox_pers.key);
|
||||||
@ -63,6 +64,13 @@ ToxAvatarManager::ToxAvatarManager(
|
|||||||
// try
|
// try
|
||||||
addAvatarFileToContact(c, tox_pers.chat_id);
|
addAvatarFileToContact(c, tox_pers.chat_id);
|
||||||
});
|
});
|
||||||
|
#else
|
||||||
|
// HACK: assumed id is pubkey
|
||||||
|
_cs.registry().view<Contact::Components::ID>().each([this](auto c, const Contact::Components::ID& id) {
|
||||||
|
// try
|
||||||
|
addAvatarFileToContact(c, id.data);
|
||||||
|
});
|
||||||
|
#endif
|
||||||
|
|
||||||
// TODO: also for group peers?
|
// TODO: also for group peers?
|
||||||
// TODO: conf?
|
// TODO: conf?
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
#include <solanaceae/object_store/object_store.hpp>
|
#include <solanaceae/object_store/object_store.hpp>
|
||||||
#include <solanaceae/contact/fwd.hpp>
|
#include <solanaceae/contact/fwd.hpp>
|
||||||
#include <solanaceae/tox_contacts/tox_contact_model2.hpp>
|
|
||||||
|
|
||||||
#include "./backends/std_fs.hpp"
|
#include "./backends/std_fs.hpp"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user