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

Implement wss preference url in html; Update to work with the tip of vnext branch; allow viewing the android ui from the webpack server (#918)

Browse source 
* Merge branch 'vnext' of https://github.com/mozilla/send into android-preferences

Fix conflicts

* Implement wss preference url in html; Update to work with the tip of vnext branch; allow viewing the android ui from the webpack server

* Use a try/catch in case localStorage isn't available, which it isn't in a ServiceWorker
This commit is contained in:
Donovan Preston 2018-09-06 18:56:04 -04:00 • committed by GitHub
parent 690a705be9
commit 71ea4e74f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 97 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
android/android.js
View file

@ -1,6 +1,21 @@
/* global window */
window.MAXFILESIZE = 1024 * 1024 * 1024 * 2;
window.LIMITS = {
ANON: {
MAX_FILE_SIZE: 1024 * 1024 * 1024 * 2,
MAX_DOWNLOADS: 32,
MAX_EXPIRE_SECONDS: 604800
},
MAX_FILE_SIZE: 1024 * 1024 * 1024 * 2,
MAX_DOWNLOADS: 32,
MAX_EXPIRE_SECONDS: 604800,
MAX_FILES_PER_ARCHIVE: 32,
MAX_ARCHIVES_PER_USER: 32
};
window.DEFAULTS = {
EXPIRE_SECONDS: 3600
};
const choo = require('choo');
const app = choo();
@ -11,4 +26,6 @@ app.use(require('./stores/intents').default);
app.route('/', require('./pages/home').default);
app.route('/upload', require('./pages/upload').default);
app.route('/share/:id', require('./pages/share').default);
app.route('/preferences', require('./pages/preferences').default);
app.route('/android/app/src/main/assets', require('./pages/home').default);
app.mount('body');