From 99f6f53e40fb04f11ab407df4b46e8f695ab43a3 Mon Sep 17 00:00:00 2001 From: Danny Coates Date: Tue, 6 Nov 2018 11:21:14 -0800 Subject: [PATCH] renamed android's index.html to android.html --- .../src/main/java/com/mozilla/send/sendandroid/MainActivity.kt | 2 +- build/android_index_plugin.js | 2 +- server/bin/dev.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/com/mozilla/send/sendandroid/MainActivity.kt b/android/app/src/main/java/com/mozilla/send/sendandroid/MainActivity.kt index 2a98afc4..70f90964 100644 --- a/android/app/src/main/java/com/mozilla/send/sendandroid/MainActivity.kt +++ b/android/app/src/main/java/com/mozilla/send/sendandroid/MainActivity.kt @@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener { // val stream = contentResolver.openInputStream(imageUri) } } - mWebView!!.loadUrl("file:///android_asset/index.html") + mWebView!!.loadUrl("file:///android_asset/android.html") } @SuppressLint("NewApi") diff --git a/build/android_index_plugin.js b/build/android_index_plugin.js index 7250ae6d..b1e310e8 100644 --- a/build/android_index_plugin.js +++ b/build/android_index_plugin.js @@ -42,7 +42,7 @@ class AndroidIndexPlugin { ` .toString() .replace(/\n\s{6}/g, '\n'); - compilation.assets['index.html'] = { + compilation.assets['android.html'] = { source() { return page; }, diff --git a/server/bin/dev.js b/server/bin/dev.js index b4ea500b..cb1d211c 100644 --- a/server/bin/dev.js +++ b/server/bin/dev.js @@ -21,7 +21,7 @@ module.exports = function(app, devServer) { app.use(morgan('dev', { stream: process.stderr })); function android(req, res) { const index = devServer.middleware.fileSystem.readFileSync( - devServer.middleware.getFilenameFromUrl('/index.html') + devServer.middleware.getFilenameFromUrl('/android.html') ); res.set('Content-Type', 'text/html'); res.send(index);