From 52b4c382cb5655de434458dc961a7b5af8dcc5ec Mon Sep 17 00:00:00 2001
From: Donovan Preston <donovanpreston@gmail.com>
Date: Thu, 10 Jan 2019 15:08:16 -0500
Subject: [PATCH 1/2] Make ANDROID=1 npm start work again, as it broke at some
 point

---
 server/bin/dev.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/bin/dev.js b/server/bin/dev.js
index 574988a8..b1bfb713 100644
--- a/server/bin/dev.js
+++ b/server/bin/dev.js
@@ -21,7 +21,10 @@ module.exports = function(app, devServer) {
     const index = devServer.middleware.fileSystem
       .readFileSync(devServer.middleware.getFilenameFromUrl('/android.html'))
       .toString()
-      .replace('<base href="file:///android_asset/" />', '');
+      .replace(
+        '<base href="file:///android_asset/" />',
+        '<base href="http://localhost:8080/" />'
+      );
     res.set('Content-Type', 'text/html');
     res.send(index);
   }
@@ -30,7 +33,7 @@ module.exports = function(app, devServer) {
     app.get('/', android);
     app.get('/legal', android);
     app.get(`/share/:id${ID_REGEX}`, android);
-    app.get(`/download/:id${ID_REGEX}`, android);
+    app.get(`/download/:id${ID_REGEX}/:key`, android);
     app.get('/completed', android);
     app.get('/preferences', android);
     app.get('/options', android);

From 3df32e2a225828b859e8b5361b86f1c661307a72 Mon Sep 17 00:00:00 2001
From: Danny Coates <dannycoates@gmail.com>
Date: Thu, 10 Jan 2019 15:00:03 -0800
Subject: [PATCH 2/2] removed /download from android routes in dev.js since it
 has no ui

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

diff --git a/server/bin/dev.js b/server/bin/dev.js
index b1bfb713..4d5010fa 100644
--- a/server/bin/dev.js
+++ b/server/bin/dev.js
@@ -33,7 +33,6 @@ module.exports = function(app, devServer) {
     app.get('/', android);
     app.get('/legal', android);
     app.get(`/share/:id${ID_REGEX}`, android);
-    app.get(`/download/:id${ID_REGEX}/:key`, android);
     app.get('/completed', android);
     app.get('/preferences', android);
     app.get('/options', android);