Compare commits

..

1 Commits

Author SHA1 Message Date
Sarah Jamie Lewis 14fa3b1a5b
Remove defunct ReconnectCwtchForeground handlers
continuous-integration/drone/pr Build is pending Details
2024-02-26 18:39:48 -08:00
2 changed files with 3 additions and 33 deletions

View File

@ -3,7 +3,6 @@ import 'package:cwtch/cwtch/cwtch.dart';
import 'package:cwtch/main.dart';
import 'package:cwtch/models/appstate.dart';
import 'package:cwtch/models/contact.dart';
import 'package:cwtch/models/message.dart';
import 'package:cwtch/models/profilelist.dart';
import 'package:cwtch/models/remoteserver.dart';
import 'package:cwtch/models/servers.dart';

View File

@ -64,7 +64,6 @@ Message compileOverlay(MessageInfo messageInfo) {
abstract class CacheHandler {
Future<MessageInfo?> get(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache);
Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache);
}
class ByIndex implements CacheHandler {
@ -129,7 +128,7 @@ class ByIndex implements CacheHandler {
List<dynamic> messagesWrapper = jsonDecode(msgs);
for (; i < messagesWrapper.length; i++) {
var messageInfo = MessageWrapperToInfo(profileOnion, conversationIdentifier, messagesWrapper[i]);
var messageInfo = messageWrapperToInfo(profileOnion, conversationIdentifier, messagesWrapper[i]);
cache.addIndexed(messageInfo, start + i);
}
} catch (e, stacktrace) {
@ -144,13 +143,6 @@ class ByIndex implements CacheHandler {
void add(MessageCache cache, MessageInfo messageInfo) {
cache.addIndexed(messageInfo, index);
}
@override
Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
EnvironmentConfig.debugLog("performing a resync on message ${index}");
fetchAndProcess(index, 1, cwtch, profileOnion, conversationIdentifier, cache);
return get(cwtch, profileOnion, conversationIdentifier, cache);
}
}
class ById implements CacheHandler {
@ -180,11 +172,6 @@ class ById implements CacheHandler {
}
return fetch(cwtch, profileOnion, conversationIdentifier, cache);
}
@override
Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
return get(cwtch, profileOnion, conversationIdentifier, cache);
}
}
class ByContentHash implements CacheHandler {
@ -213,11 +200,6 @@ class ByContentHash implements CacheHandler {
}
return fetch(cwtch, profileOnion, conversationIdentifier, cache);
}
@override
Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
return get(cwtch, profileOnion, conversationIdentifier, cache);
}
}
List<Message> getReplies(MessageCache cache, int messageIdentifier) {
@ -275,16 +257,6 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, int co
MessageInfo? messageInfo = await cacheHandler.get(cwtch, profileOnion, conversationIdentifier, cache);
if (messageInfo != null) {
if (messageInfo.metadata.ackd == false) {
if (messageInfo.metadata.lastChecked == null || messageInfo.metadata.lastChecked!.difference(DateTime.now()).abs().inSeconds > 30) {
messageInfo.metadata.lastChecked = DateTime.now();
// NOTE: Only ByIndex lookups will trigger
messageInfo = await cacheHandler.sync(cwtch, profileOnion, conversationIdentifier, cache);
}
}
}
if (messageInfo != null) {
return compileOverlay(messageInfo);
} else {
@ -300,14 +272,14 @@ MessageInfo? messageJsonToInfo(String profileOnion, int conversationIdentifier,
return null;
}
return MessageWrapperToInfo(profileOnion, conversationIdentifier, messageWrapper);
return messageWrapperToInfo(profileOnion, conversationIdentifier, messageWrapper);
} catch (e, stacktrace) {
EnvironmentConfig.debugLog("message handler exception on parse message and cache: " + e.toString() + " " + stacktrace.toString());
return null;
}
}
MessageInfo MessageWrapperToInfo(String profileOnion, int conversationIdentifier, dynamic messageWrapper) {
MessageInfo messageWrapperToInfo(String profileOnion, int conversationIdentifier, dynamic messageWrapper) {
// Construct the initial metadata
var messageID = messageWrapper['ID'];
var timestamp = DateTime.tryParse(messageWrapper['Timestamp'])!;
@ -340,7 +312,6 @@ class MessageMetadata extends ChangeNotifier {
final String? signature;
final String contenthash;
DateTime? lastChecked;
dynamic get attributes => this._attributes;