From 5ec2486c57ce6de4016f60497562d833dce9aad1 Mon Sep 17 00:00:00 2001
From: Donovan Preston <donovanpreston@gmail.com>
Date: Mon, 24 Sep 2018 12:30:27 -0400
Subject: [PATCH 1/4] Add ui for setting max downloads, max time, and password.

---
 android/android.js                          |   4 +
 android/app/app.iml                         |   5 +-
 android/app/src/main/assets/index.css       |  16 ++++
 android/app/src/main/assets/preferences.png | Bin 0 -> 3552 bytes
 android/app/src/main/assets/top-banner.png  | Bin 0 -> 5499 bytes
 android/pages/error.js                      |  10 +++
 android/pages/home.js                       |  10 ++-
 android/pages/options.js                    |  94 ++++++++++++++++++++
 8 files changed, 134 insertions(+), 5 deletions(-)
 create mode 100644 android/app/src/main/assets/preferences.png
 create mode 100644 android/app/src/main/assets/top-banner.png
 create mode 100644 android/pages/error.js
 create mode 100644 android/pages/options.js

diff --git a/android/android.js b/android/android.js
index c7b0c4b4..1055146c 100644
--- a/android/android.js
+++ b/android/android.js
@@ -24,7 +24,11 @@ app.use(require('./stores/state').default);
 app.use(require('../app/fileManager').default);
 app.use(require('./stores/intents').default);
 app.route('/', require('./pages/home').default);
+app.route('/options', require('./pages/options').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('/error', require('./pages/error').default);
+//app.route('/debugging', require('./pages/debugging').default);
+// add /api/filelist
 app.mount('body');
diff --git a/android/app/app.iml b/android/app/app.iml
index 42cb679c..bfc58132 100644
--- a/android/app/app.iml
+++ b/android/app/app.iml
@@ -22,13 +22,14 @@
       </configuration>
     </facet>
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
+      <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
+          <option name="jvmTarget" value="1.8" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.2" />
@@ -111,6 +112,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
@@ -125,6 +127,7 @@
       <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/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/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
diff --git a/android/app/src/main/assets/index.css b/android/app/src/main/assets/index.css
index 11751781..c1e37fad 100644
--- a/android/app/src/main/assets/index.css
+++ b/android/app/src/main/assets/index.css
@@ -106,3 +106,19 @@ body {
 #preferences {
   text-align: left;
 }
+
+#hamburger {
+  position: fixed;
+  right: 2em;
+  top: 1em;
+}
+
+#top-banner {
+  position: fixed;
+  top: 1em;
+  left: 2em;
+}
+
+#options {
+  text-align: left;
+}
diff --git a/android/app/src/main/assets/preferences.png b/android/app/src/main/assets/preferences.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2965d1f68699f7e5e8695a95ffc76eb43d303d7
GIT binary patch
literal 3552
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
QzyGd@;U$9_J?F^(1NEDmS^xk5

literal 0
HcmV?d00001

diff --git a/android/app/src/main/assets/top-banner.png b/android/app/src/main/assets/top-banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ef25df0e86588706db436adcd12eba051d5230
GIT binary patch
literal 5499
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

literal 0
HcmV?d00001

diff --git a/android/pages/error.js b/android/pages/error.js
new file mode 100644
index 00000000..76cdd80c
--- /dev/null
+++ b/android/pages/error.js
@@ -0,0 +1,10 @@
+const html = require('choo/html');
+
+export default function error(_state, _emit) {
+  return html`<body>
+  <div id="white">
+    <h1>Error</h1>
+    <p>Sorry, an error occurred.</p>
+  </div>
+</body>`;
+}
diff --git a/android/pages/home.js b/android/pages/home.js
index bc604f6a..f6c83e61 100644
--- a/android/pages/home.js
+++ b/android/pages/home.js
@@ -5,6 +5,7 @@ export default function mainPage(state, emit) {
     event.preventDefault();
     emit('pushState', '/preferences');
   }
+
   function uploadFile(event) {
     event.preventDefault();
     const target = event.target;
@@ -13,15 +14,16 @@ export default function mainPage(state, emit) {
       return;
     }
 
-    emit('pushState', '/upload');
+    emit('pushState', '/options');
     emit('addFiles', { files: [file] });
-    emit('upload', {});
   }
+
   return html`<body>
   <div id="white">
     <div id="centering">
-      <a href="#" onclick=${clickPreferences}>
-      preferenes
+      <img id="top-banner" src=${state.getAsset('top-banner.png')} />
+      <a id="hamburger" href="#" onclick=${clickPreferences}>
+        <img src=${state.getAsset('preferences.png')} />
       </a>
       <img src=${state.getAsset('encrypted-envelope.png')} />
       <h4>Private, Encrypted File Sharing</h4>
diff --git a/android/pages/options.js b/android/pages/options.js
new file mode 100644
index 00000000..287bda90
--- /dev/null
+++ b/android/pages/options.js
@@ -0,0 +1,94 @@
+const html = require('choo/html');
+
+export default function options(state, emit) {
+  function clickCancel(event) {
+    event.preventDefault();
+    emit('pushState', '/');
+  }
+
+  async function submitForm(event) {
+    event.preventDefault();
+    if (this.addPassword.checked) {
+      if (this.password.value !== this.confirmPassword.value) {
+        state.passwordDoesNotMatchError = true;
+        emit('render');
+        return;
+      } else {
+        state.passwordDoesNotMatchError = false;
+      }
+    }
+    emit('upload', {
+      type: 'click',
+      dlimit: parseInt(event.target.numDownloads.value),
+      password: event.target.password.value
+    });
+    emit('pushState', '/upload');
+  }
+
+  function addPasswordChange(event) {
+    const pw = document.getElementById('password-section');
+    if (event.target.checked) {
+      pw.style.display = 'block';
+    } else {
+      pw.style.display = 'none';
+    }
+  }
+
+  const passwordDoesNotMatchDisplayStyle = state.passwordDoesNotMatchError
+    ? 'display: block'
+    : 'display: none';
+  const passwordChecked = state.passwordDoesNotMatchError ? true : false;
+
+  return html`<body>
+  <div id="white">
+    <div id="options">
+      <a onclick=${clickCancel} class="cancel" href="#">
+      cancel
+      </a>
+      <h5>Selected files</h5>
+      <ul>
+        <li>file</li>
+      </ul>
+      <div id="options-controls">
+        <form onsubmit=${submitForm}>
+          <div id="expires-after-section">
+            <h5>Expires after</h5>
+            <select name="numDownloads">
+              <option value="1">1 download</option>
+              <option value="2">2 downloads</option>
+              <option value="3">3 downloads</option>
+              <option value="4">4 downloads</option>
+              <option value="5">5 downloads</option>
+              <option value="20">20 downloads</option>
+              <option value="50">50 downloads</option>
+              <option value="100">100 downloads</option>
+              <option value="200">200 downloads</option>
+            </select>
+            or
+            <select name="maxTime">
+              <option value="300">5 minutes</option>
+              <option value="3600">1 hour</option>
+              <option value="86400" selected="true">24 hours</option>
+              <option value="604800">7 days</option>
+            </select>
+          </div>
+          <div id="set-password-section">
+            <input onchange=${addPasswordChange} name="addPassword" autocomplete="off" type="checkbox" checked=${passwordChecked}>
+            <label for="addPassword">Protect with password</label>
+            <div id="password-section" style=${passwordDoesNotMatchDisplayStyle}>
+              <div style=${passwordDoesNotMatchDisplayStyle}>
+                Passwords must match.
+              </div>
+              <h5>Password:</h5>
+              <input name="password" type="password" />
+              <h5>Confirm password:</h5>
+              <input name="confirmPassword" type="password" />
+            </div>
+          </div>
+          <button>Send</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</body>`;
+}

From a181bb350967538755625fb6c1a44d726c6a84eb Mon Sep 17 00:00:00 2001
From: Donovan Preston <donovanpreston@gmail.com>
Date: Mon, 24 Sep 2018 15:06:15 -0400
Subject: [PATCH 2/4] Set the time limit in state so that fileManager can get
 to it.

---
 android/pages/options.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/pages/options.js b/android/pages/options.js
index 287bda90..04587e56 100644
--- a/android/pages/options.js
+++ b/android/pages/options.js
@@ -17,6 +17,7 @@ export default function options(state, emit) {
         state.passwordDoesNotMatchError = false;
       }
     }
+    state.timeLimit = parseInt(event.target.maxTime);
     emit('upload', {
       type: 'click',
       dlimit: parseInt(event.target.numDownloads.value),

From 8b21a54ab414f694cf7c398d8fffbd3904f1ab6c Mon Sep 17 00:00:00 2001
From: Donovan Preston <donovanpreston@gmail.com>
Date: Mon, 24 Sep 2018 16:41:50 -0400
Subject: [PATCH 3/4] Add the options route to the dev server

---
 server/bin/dev.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/bin/dev.js b/server/bin/dev.js
index 4f6ca1d0..13e3d2b2 100644
--- a/server/bin/dev.js
+++ b/server/bin/dev.js
@@ -44,6 +44,7 @@ module.exports = function(app, devServer) {
     app.get(`/download/:id${ID_REGEX}`, android);
     app.get('/completed', android);
     app.get('/preferences', android);
+    app.get('/options', android);
     app.get('/api/fxa/oauth', android);
   }
   routes(app);

From 6b9a735bec6a3445c4a8a5ce57bd530b33823c9f Mon Sep 17 00:00:00 2001
From: Danny Coates <dannycoates@gmail.com>
Date: Tue, 25 Sep 2018 11:36:23 -0700
Subject: [PATCH 4/4] parameterize download count dropdown on android

---
 android/android.js       |  2 ++
 android/pages/options.js | 15 ++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/android/android.js b/android/android.js
index 1055146c..a19dd05e 100644
--- a/android/android.js
+++ b/android/android.js
@@ -14,6 +14,8 @@ window.LIMITS = {
 };
 
 window.DEFAULTS = {
+  DOWNLOAD_COUNTS: [1, 2, 3, 4, 5, 20, 50, 100, 200],
+  EXPIRE_TIMES_SECONDS: [300, 3600, 86400, 604800],
   EXPIRE_SECONDS: 3600
 };
 
diff --git a/android/pages/options.js b/android/pages/options.js
index 04587e56..8491305b 100644
--- a/android/pages/options.js
+++ b/android/pages/options.js
@@ -1,3 +1,4 @@
+/* globals DEFAULTS */
 const html = require('choo/html');
 
 export default function options(state, emit) {
@@ -55,15 +56,11 @@ export default function options(state, emit) {
           <div id="expires-after-section">
             <h5>Expires after</h5>
             <select name="numDownloads">
-              <option value="1">1 download</option>
-              <option value="2">2 downloads</option>
-              <option value="3">3 downloads</option>
-              <option value="4">4 downloads</option>
-              <option value="5">5 downloads</option>
-              <option value="20">20 downloads</option>
-              <option value="50">50 downloads</option>
-              <option value="100">100 downloads</option>
-              <option value="200">200 downloads</option>
+            ${DEFAULTS.DOWNLOAD_COUNTS.map(i => {
+              return html`<option value="${i}">${i} download${
+                i > 1 ? 's' : ''
+              }</option>`;
+            })}
             </select>
             or
             <select name="maxTime">