GetMessagesByContentHash + Other API Fixes
continuous-integration/drone/pr Build is failing
Details
continuous-integration/drone/pr Build is failing
Details
This commit is contained in:
parent
3cc56fb011
commit
6723bdf558
8
lib.go
8
lib.go
|
@ -454,14 +454,14 @@ func LoadProfiles(pass string) {
|
|||
application.LoadProfiles(pass)
|
||||
}
|
||||
|
||||
//export c_AcceptConversations
|
||||
func c_AcceptConversations(profilePtr *C.char, profileLen C.int, conversation_id C.int) {
|
||||
AcceptConversations(C.GoStringN(profilePtr, profileLen), int(conversation_id))
|
||||
//export c_AcceptConversation
|
||||
func c_AcceptConversation(profilePtr *C.char, profileLen C.int, conversation_id C.int) {
|
||||
AcceptConversation(C.GoStringN(profilePtr, profileLen), int(conversation_id))
|
||||
}
|
||||
|
||||
// AcceptConversations takes in a profileOnion and a handle to either a group or a peer and authorizes the handle
|
||||
// for further action (e.g. messaging / connecting to the server / joining the group etc.)
|
||||
func AcceptConversations(profileOnion string, conversation_id int) {
|
||||
func AcceptConversation(profileOnion string, conversation_id int) {
|
||||
profile := application.GetPeer(profileOnion)
|
||||
profile.AcceptConversation(int(conversation_id))
|
||||
}
|
||||
|
|
|
@ -151,9 +151,9 @@ func (eh *EventHandler) handleAppBusEvent(e *event.Event) string {
|
|||
continue
|
||||
}
|
||||
|
||||
name, exists := conversationInfo.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.Name)
|
||||
name, exists := conversationInfo.GetAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)
|
||||
if !exists {
|
||||
name, exists = conversationInfo.GetAttribute(attr.PeerScope, attr.ProfileZone, constants.Name)
|
||||
name, exists = conversationInfo.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.Name)
|
||||
if !exists {
|
||||
name = conversationInfo.Handle
|
||||
}
|
||||
|
@ -351,6 +351,7 @@ func (eh *EventHandler) startHandlingPeer(onion string) {
|
|||
eventBus.Subscribe(event.AppError, q)
|
||||
eventBus.Subscribe(event.IndexedAcknowledgement, q)
|
||||
eventBus.Subscribe(event.IndexedFailure, q)
|
||||
eventBus.Subscribe(event.ContactCreated, q)
|
||||
eventBus.Subscribe(event.NewMessageFromGroup, q)
|
||||
eventBus.Subscribe(event.MessageCounterResync, q)
|
||||
eventBus.Subscribe(event.GroupCreated, q)
|
||||
|
|
Reference in New Issue