dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add setApiUrlPrefix and use it in the android version.

Browse source
This commit is contained in:
Donovan Preston 2018-11-19 15:10:57 -05:00
parent 74d8a12c07
commit ae4b8cf0d3
4 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/fileReceiver.js
View file

@ -1,7 +1,7 @@
import Nanobus from 'nanobus';
import Keychain from './keychain';
import { delay, bytes, streamToArrayBuffer } from './utils';
import { downloadFile, metadata } from './api';
import { downloadFile, metadata, getApiUrl } from './api';
import { blobStream } from './streams';
import Zip from './zip';
@ -145,14 +145,18 @@ export default class FileReceiver extends Nanobus {
onprogress(0);
if (noSave) {
const res = await fetch(`/api/download/${this.fileInfo.id}`);
const res = await fetch(getApiUrl(`/api/download/${this.fileInfo.id}`));
if (res.status !== 200) {
throw new Error(res.status);
}
} else {
const downloadUrl = `${location.protocol}//${
location.host
}/api/download/${this.fileInfo.id}`;
const downloadPath = `/api/download/${this.fileInfo.id}`;
let downloadUrl = getApiUrl(downloadPath);
if (downloadUrl === downloadPath) {
downloadUrl = `${location.protocol}//${location.host}/api/download/${
this.fileInfo.id
}`;
}
const a = document.createElement('a');
a.href = downloadUrl;
document.body.appendChild(a);