natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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) 

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
android/android.js
View File

@ -1,6 +1,21 @@
/* global window */ /* 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 choo = require('choo');
const app = choo(); const app = choo();
@ -11,4 +26,6 @@ app.use(require('./stores/intents').default);
app.route('/', require('./pages/home').default); app.route('/', require('./pages/home').default);
app.route('/upload', require('./pages/upload').default); app.route('/upload', require('./pages/upload').default);
app.route('/share/:id', require('./pages/share').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'); app.mount('body');

4
android/app/app.iml
View File

@ -22,14 +22,13 @@
</configuration> </configuration>
</facet> </facet>
<facet type="kotlin-language" name="Kotlin"> <facet type="kotlin-language" name="Kotlin">
<configuration version="3" platform="JVM 1.8" useProjectSettings="false"> <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings /> <compilerSettings />
<compilerArguments> <compilerArguments>
<option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" /> <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
<option name="noStdlib" value="true" /> <option name="noStdlib" value="true" />
<option name="noReflect" value="true" /> <option name="noReflect" value="true" />
<option name="moduleName" value="app_debug" /> <option name="moduleName" value="app_debug" />
<option name="jvmTarget" value="1.8" />
<option name="addCompilerBuiltIns" value="true" /> <option name="addCompilerBuiltIns" value="true" />
<option name="loadBuiltInsFromDependencies" value="true" /> <option name="loadBuiltInsFromDependencies" value="true" />
<option name="languageVersion" value="1.2" /> <option name="languageVersion" value="1.2" />
@ -126,7 +125,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />

4
android/app/src/main/assets/index.css
View File

@ -102,3 +102,7 @@ body {
.cancel { .cancel {
text-align: right; text-align: right;
} }
#preferences {
text-align: left;
}

12
android/pages/home.js
View File

@ -1,6 +1,15 @@
const html = require('choo/html'); const html = require('choo/html');
export default function mainPage(state, emit) { export default function mainPage(state, emit) {
if (window.location.pathname === '/android/app/src/main/assets/') {
// Hack: For debugging the android app in a web browser from
// http://0.0.0.0:8080/android/app/src/main/assets/ after running webpack
state.prefix = '/android/app/src/main/assets';
}
function clickPreferences(event) {
event.preventDefault();
emit('pushState', '/preferences');
}
function uploadFile(event) { function uploadFile(event) {
event.preventDefault(); event.preventDefault();
const target = event.target; const target = event.target;
@ -16,6 +25,9 @@ export default function mainPage(state, emit) {
return html`<body> return html`<body>
<div id="white"> <div id="white">
<div id="centering"> <div id="centering">
<a href="#" onclick=${clickPreferences}>
preferenes
</a>
<img src=${state.getAsset('encrypted-envelope.png')} /> <img src=${state.getAsset('encrypted-envelope.png')} />
<h4>Private, Encrypted File Sharing</h4> <h4>Private, Encrypted File Sharing</h4>
<div> <div>

36
android/pages/preferences.js Normal file
View File

@ -0,0 +1,36 @@
const html = require('choo/html');
import { setFileProtocolWssUrl, getFileProtocolWssUrl } from '../../app/api';
export default function preferences(state, emit) {
const wssURL = getFileProtocolWssUrl();
function updateWssUrl(event) {
state.wssURL = event.target.value;
setFileProtocolWssUrl(state.wssURL);
emit('render');
}
function clickDone(event) {
event.preventDefault();
emit('pushState', '/');
}
return html`<body>
<div id="white">
<div id="preferences">
<a onclick=${clickDone} href="#">
done
</a>
<dl>
<dt>
wss url:
</dt>
<dd>
<input type="text" onchange=${updateWssUrl} value=${wssURL} />
</dd>
</dl>
</div>
</div>
</body>`;
}

7
android/stores/state.js
View File

@ -1,11 +1,16 @@
/* eslint-disable no-console */ /* eslint-disable no-console */
import User from '../../app/user';
import storage from '../../app/storage';
export default function initialState(state, emitter) { export default function initialState(state, emitter) {
const files = []; const files = [];
Object.assign(state, { Object.assign(state, {
prefix: '/android_asset',
user: new User(undefined, storage),
getAsset(name) { getAsset(name) {
return `/android_asset/${name}`; return `${state.prefix}/${name}`;
}, },
translate: (...toTranslate) => { translate: (...toTranslate) => {
return toTranslate.map(o => JSON.stringify(o)).toString(); return toTranslate.map(o => JSON.stringify(o)).toString();

21
app/api.js
View File

@ -1,6 +1,25 @@
import { arrayToB64, b64ToArray, delay } from './utils'; import { arrayToB64, b64ToArray, delay } from './utils';
import { ECE_RECORD_SIZE } from './ece'; import { ECE_RECORD_SIZE } from './ece';
let fileProtocolWssUrl = null;
try {
fileProtocolWssUrl = localStorage.getItem('wssURL');
} catch (e) {
// NOOP
}
if (!fileProtocolWssUrl) {
fileProtocolWssUrl = 'wss://send2.dev.lcip.org/api/ws';
}
export function setFileProtocolWssUrl(url) {
localStorage && localStorage.setItem('wssURL', url);
fileProtocolWssUrl = url;
}
export function getFileProtocolWssUrl() {
return fileProtocolWssUrl;
}
function post(obj, bearerToken) { function post(obj, bearerToken) {
const h = { const h = {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -147,7 +166,7 @@ async function upload(
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
const endpoint = const endpoint =
window.location.protocol === 'file:' window.location.protocol === 'file:'
? 'wss://send2.dev.lcip.org/api/ws' ? fileProtocolWssUrl
: `${protocol}//${host}${port ? ':' : ''}${port}/api/ws`; : `${protocol}//${host}${port ? ':' : ''}${port}/api/ws`;
const ws = await asyncInitWebSocket(endpoint); const ws = await asyncInitWebSocket(endpoint);