cwtch.im
/
libcwtch-go
Archived
3
0
Fork 1
Code Issues 2 Pull Requests Releases 26 Wiki Activity

Merge pull request 'Document Android edge case and clarify design of GetMessage' (#8) from fix-sync into trunk
continuous-integration/drone/push Build is passing Details 

Reviewed-on: #8
Reviewed-by: erinn <erinn@openprivacy.ca>
This commit is contained in:
erinn 2021-06-30 13:45:08 -07:00
parent 539a28444b 98ebe3aacb
commit 58460ca0ca
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib.go
View File

@ -493,36 +493,47 @@ type EnhancedMessage struct {
} }
func GetMessage(profileOnion, handle string, message_index int) string { func GetMessage(profileOnion, handle string, message_index int) string {
profile := application.GetPeer(profileOnion)
ph := utils.NewPeerHelper(profile)
var message EnhancedMessage var message EnhancedMessage
if ph.IsGroup(handle) { // There is an edge case that can happen on Android when the app is shutdown while fetching messages...
if len(profile.GetGroup(handle).Timeline.Messages) > message_index { // The worker threads that are spawned can become activated again when the app is opened attempt to finish their job...
message.Message = profile.GetGroup(handle).Timeline.Messages[message_index] // In that case we skip processing and just return the empty message...
message.ContactImage = ph.GetProfilePic(message.Message.PeerID) // Note: This is far less likely to happen now that the UI only requests messages *after* syncing has happened and
} else { // these requests complete almost immediately v.s. being stalled for seconds to minutes on large groups.
// Message Index Request exceeded Timeline, most likely reason is this is a request for an if application != nil {
// unacknowledged sent message (it can take a many seconds for a message to be confirmed in the worst profile := application.GetPeer(profileOnion)
// case). ph := utils.NewPeerHelper(profile)
offset := message_index - len(profile.GetGroup(handle).Timeline.Messages) if ph.IsGroup(handle) {
if len(profile.GetGroup(handle).UnacknowledgedMessages) > offset { // If we are safely within the limits of the timeline just grab the message at the index..
message.Message = profile.GetGroup(handle).UnacknowledgedMessages[offset] if len(profile.GetGroup(handle).Timeline.Messages) > message_index {
message.Message = profile.GetGroup(handle).Timeline.Messages[message_index]
message.ContactImage = ph.GetProfilePic(message.Message.PeerID) message.ContactImage = ph.GetProfilePic(message.Message.PeerID)
} else { } else {
log.Errorf("Couldn't find message in timeline or unacked messages, probably transient threading issue, but logging for visibility..") // Message Index Request exceeded Timeline, most likely reason is this is a request for an
// unacknowledged sent message (it can take a many seconds for a message to be confirmed in the worst
// case).
offset := message_index - len(profile.GetGroup(handle).Timeline.Messages)
if len(profile.GetGroup(handle).UnacknowledgedMessages) > offset {
message.Message = profile.GetGroup(handle).UnacknowledgedMessages[offset]
message.ContactImage = ph.GetProfilePic(message.Message.PeerID)
} else {
log.Errorf("Couldn't find message in timeline or unacked messages, probably transient threading issue, but logging for visibility..")
}
} }
}
} else {
if message_index < len(profile.GetContact(handle).Timeline.Messages) {
message.Message = profile.GetContact(handle).Timeline.Messages[message_index]
message.ContactImage = ph.GetProfilePic(handle)
} else { } else {
log.Errorf("peerpeercontact getmessage out of range; sending counter resync just in case") // If we are safely within the limits of the timeline just grab the message at the index..
eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{ if len(profile.GetContact(handle).Timeline.Messages) > message_index {
event.Identity: profileOnion, message.Message = profile.GetContact(handle).Timeline.Messages[message_index]
event.RemotePeer: handle, message.ContactImage = ph.GetProfilePic(handle)
event.Data: strconv.Itoa(len(profile.GetContact(handle).Timeline.Messages)), } else {
})) // Otherwise Send a counter resync event...this shouldn't really happen for p2p messages so we
// throw an error.
log.Errorf("peerpeercontact getmessage out of range; sending counter resync just in case")
eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{
event.Identity: profileOnion,
event.RemotePeer: handle,
event.Data: strconv.Itoa(len(profile.GetContact(handle).Timeline.Messages)),
}))
}
} }
} }
bytes, _ := json.Marshal(message) bytes, _ := json.Marshal(message)