dan
/
ricochet-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Skip message 'SENDING' until go-ricochet supports ACKs

This commit is contained in:
John Brooks 2017-08-11 13:59:22 -06:00
parent dcda924d56
commit 03b6205850
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/conversation.go
View File

@ -2,9 +2,9 @@ package core
import ( import (
"errors" "errors"
protocol "github.com/s-rah/go-ricochet"
"github.com/ricochet-im/ricochet-go/core/utils" "github.com/ricochet-im/ricochet-go/core/utils"
"github.com/ricochet-im/ricochet-go/rpc" "github.com/ricochet-im/ricochet-go/rpc"
protocol "github.com/s-rah/go-ricochet"
"log" "log"
"math/rand" "math/rand"
"sync" "sync"
@ -63,6 +63,10 @@ func (c *Conversation) Receive(id uint64, timestamp int64, text string) {
c.mutex.Lock() c.mutex.Lock()
defer c.mutex.Unlock() defer c.mutex.Unlock()
// XXX The Qt implementation would discard duplicate messages by checking
// the most recent 5 messages for any received message that matches this one
// in both id and text. Should do that here.
c.messages = append(c.messages, message) c.messages = append(c.messages, message)
event := ricochet.ConversationEvent{ event := ricochet.ConversationEvent{
Type: ricochet.ConversationEvent_RECEIVE, Type: ricochet.ConversationEvent_RECEIVE,
@ -129,7 +133,9 @@ func (c *Conversation) Send(text string) (*ricochet.Message, error) {
conn := c.Contact.Connection() conn := c.Contact.Connection()
if conn != nil { if conn != nil {
sendMessageToConnection(conn, message) sendMessageToConnection(conn, message)
message.Status = ricochet.Message_SENDING // XXX go-ricochet doesn't support message IDs & ack properly yet, so skip SENDING
//message.Status = ricochet.Message_SENDING
message.Status = ricochet.Message_DELIVERED
} }
c.messages = append(c.messages, message) c.messages = append(c.messages, message)
@ -161,7 +167,9 @@ func (c *Conversation) SendQueuedMessages() int {
} }
sendMessageToConnection(conn, message) sendMessageToConnection(conn, message)
message.Status = ricochet.Message_SENDING // XXX go-ricochet doesn't support message IDs & ack properly yet, so skip SENDING
//message.Status = ricochet.Message_SENDING
message.Status = ricochet.Message_DELIVERED
sent++ sent++
event := ricochet.ConversationEvent{ event := ricochet.ConversationEvent{