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

Remove download directory checks for Android
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Sarah Jamie Lewis 2022-12-12 13:17:39 -08:00
parent 4e2000cae4
commit ea3ef33ac5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
functionality/filesharing/filesharing_functionality.go
View File

@ -11,6 +11,7 @@ import (
"os" "os"
path "path/filepath" path "path/filepath"
"regexp" "regexp"
"runtime"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -81,16 +82,18 @@ func (f *Functionality) DownloadFile(profile peer.CwtchPeer, conversationID int,
return errors.New("download path or manifest path is empty") return errors.New("download path or manifest path is empty")
} }
// Don't download files if the download file directory does not exist // We write to a temp file for Android...
if _, err := os.Stat(path.Dir(downloadFilePath)); os.IsNotExist(err) { if runtime.GOOS != "android" {
return errors.New("download directory does not exist") // Don't download files if the download file directory does not exist
} if _, err := os.Stat(path.Dir(downloadFilePath)); os.IsNotExist(err) {
return errors.New("download directory does not exist")
}
// Don't download files if the manifest file directory does not exist // Don't download files if the manifest file directory does not exist
if _, err := os.Stat(path.Dir(manifestFilePath)); os.IsNotExist(err) { if _, err := os.Stat(path.Dir(manifestFilePath)); os.IsNotExist(err) {
return errors.New("manifest directory does not exist") return errors.New("manifest directory does not exist")
}
} }
// Store local.filesharing.filekey.manifest as the location of the manifest // Store local.filesharing.filekey.manifest as the location of the manifest
profile.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest", key), manifestFilePath) profile.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest", key), manifestFilePath)