cwtch.im
/
cwtch
16
20
Fork 15
Code Issues 10 Pull Requests 1 Releases 163 Wiki Activity

New Storage Refactor #404

Merged
sarah merged 33 commits from p2p-interim-new-storage into master 2021-11-25 23:56:51 +00:00
Conversation 17 Commits 33 Files Changed 55 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 824cb3b951 - Show all commits

6
peer/cwtch_peer.go
View File

@ -620,9 +620,8 @@ func (cp *cwtchPeer) AddServer(serverSpecification string) (string, error) {
}
cp.SetConversationAttribute(conversationInfo.ID, attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(string(model.BundleType))), serverSpecification)
return onion, err
} else {
return "", err
}
return "", err
}
return "", model.InconsistentKeyBundleError
}
@ -750,9 +749,8 @@ func (cp *cwtchPeer) ImportBundle(importString string) error {
_, err := cp.NewContactConversation(importString, model.DefaultP2PAccessControl(), true)
if err == nil {
return ConstructResponse(importBundlePrefix, "success")
} else {
return ConstructResponse(importBundlePrefix, err.Error())
}
return ConstructResponse(importBundlePrefix, err.Error())
} else if strings.HasPrefix(importString, tofuBundlePrefix) {
bundle := strings.Split(importString, "||")
if len(bundle) == 2 {