Merge branch 'main' into safety-by-default

This commit is contained in:
TC Johnson 2023-11-11 20:37:59 -06:00
commit e301bc0cd6
No known key found for this signature in database
3 changed files with 2 additions and 3 deletions

View File

@ -180,7 +180,7 @@ class BackgroundTickerState extends ConsumerState<BackgroundTicker> {
activeAccountInfo: activeAccountInfo, activeAccountInfo: activeAccountInfo,
remoteIdentityPublicKey: remoteIdentityPublicKey, remoteIdentityPublicKey: remoteIdentityPublicKey,
remoteConversationRecordKey: remoteConversationRecordKey); remoteConversationRecordKey: remoteConversationRecordKey);
if (newMessages != null) { if (newMessages != null && newMessages.isNotEmpty) {
final changed = await mergeLocalConversationMessages( final changed = await mergeLocalConversationMessages(
activeAccountInfo: activeAccountInfo, activeAccountInfo: activeAccountInfo,
localConversationRecordKey: localConversationRecordKey, localConversationRecordKey: localConversationRecordKey,

View File

@ -78,7 +78,6 @@ class DHTRecordPool with AsyncTableDBBacked<DHTRecordPoolAllocations> {
return instanceSetupMutex.protect(() async { return instanceSetupMutex.protect(() async {
if (_singleton == null) { if (_singleton == null) {
final routingContext = await Veilid.instance.routingContext(); final routingContext = await Veilid.instance.routingContext();
final globalPool = DHTRecordPool._(Veilid.instance, routingContext); final globalPool = DHTRecordPool._(Veilid.instance, routingContext);
globalPool._state = await globalPool.load(); globalPool._state = await globalPool.load();
_singleton = globalPool; _singleton = globalPool;

View File

@ -281,7 +281,7 @@ class DHTShortArray {
/// Pull the latest or updated copy of the head record from the network /// Pull the latest or updated copy of the head record from the network
Future<bool> _refreshHead( Future<bool> _refreshHead(
{bool forceRefresh = false, bool onlyUpdates = false}) async { {bool forceRefresh = true, bool onlyUpdates = false}) async {
// Get an updated head record copy if one exists // Get an updated head record copy if one exists
final head = await _headRecord.getProtobuf(proto.DHTShortArray.fromBuffer, final head = await _headRecord.getProtobuf(proto.DHTShortArray.fromBuffer,
forceRefresh: forceRefresh, onlyUpdates: onlyUpdates); forceRefresh: forceRefresh, onlyUpdates: onlyUpdates);