Skip to content
Snippets Groups Projects

XX-4277 / Fix file transfer crashes

Merged Jono Wenger requested to merge XX-4277/fileTransferCrashDebug into release
Files
7
+ 7
0
@@ -10,6 +10,7 @@ package bindings
import (
"encoding/base64"
"encoding/json"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"time"
@@ -149,6 +150,10 @@ func InitFileTransfer(e2eID int, receiveFileCallback ReceiveFileCallback,
// Create file transfer manager
m, err := fileTransfer.NewManager(fileTransferParams, user.api)
if err != nil {
return nil, errors.Errorf(
"could not create new file transfer manager: %+v", err)
}
rcb := func(tid *ftCrypto.TransferID, fileName, fileType string,
sender *id.ID, size uint32, preview []byte) {
@@ -167,11 +172,13 @@ func InitFileTransfer(e2eID int, receiveFileCallback ReceiveFileCallback,
return nil, err
}
jww.INFO.Printf("[FT] Before AddService")
// Add file transfer processes to API services tracking
err = user.api.AddService(m.StartProcesses)
if err != nil {
return nil, err
}
jww.INFO.Printf("[FT] After AddService")
// Return wrapped manager
return &FileTransfer{w: w}, nil
Loading