.circleci/config.yml

@@ -1,99 +0,0 @@
-version: 2.0
-jobs:
-  test:
-    docker:
-      - image: circleci/node:12-browsers
-    steps:
-      - checkout
-      - run: npm ci
-      - run: npm run lint
-      - run: npm test
-      - store_artifacts:
-          path: coverage
-  integration_tests:
-    docker:
-      - image: circleci/node:12-browsers
-    steps:
-      - checkout
-      - run: npm ci
-      - run:
-          name: Run integration test
-          command: ./scripts/bin/run-integration-test-circleci.sh
-  deploy_dev:
-    docker:
-      - image: circleci/node:12
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
-      - run: docker build -t mozilla/send:latest .
-      - run: docker push mozilla/send:latest
-  deploy_vnext:
-    docker:
-      - image: circleci/node:12
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
-      - run: docker build -t mozilla/send:vnext .
-      - run: docker push mozilla/send:vnext
-  deploy_stage:
-    docker:
-      - image: circleci/node:12
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
-      - run: docker build -t mozilla/send:$CIRCLE_TAG .
-      - run: docker push mozilla/send:$CIRCLE_TAG
-workflows:
-  version: 2
-  test_pr:
-    jobs:
-      - test:
-          filters:
-            branches:
-              ignore:
-                - master
-                - vnext
-      - integration_tests:
-          filters:
-            branches:
-              ignore: master
-  build_and_deploy_dev:
-    jobs:
-      - deploy_dev:
-          filters:
-            branches:
-              only: master
-            tags:
-              ignore: /^v.*/
-      - deploy_vnext:
-          filters:
-            branches:
-              only: vnext
-            tags:
-              ignore: /^v.*/
-  build_and_deploy_stage:
-    jobs:
-      - test:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - integration_tests:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-      - deploy_stage:
-          requires:
-            - test
-            - integration_tests
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/

.dockerignore

@@ -1,8 +1,8 @@
-.circleci
-.nyc_output
-.vscode
-.DS_Store
-coverage
-docs
-firefox
 node_modules
+.git
+.DS_Store
+firefox
+assets
+docs
+public
+test

.eslintignore

@@ -1,8 +1,3 @@
 dist
 assets
 firefox
-coverage
-android/app/build
-app/locale.js
-app/capabilities.js
-app/qrcode.js

.eslintrc.yml

@@ -4,7 +4,6 @@ env:
 
 extends:
   - eslint:recommended
-  - prettier
   - plugin:node/recommended
   - plugin:security/recommended
 
@@ -15,14 +14,18 @@ plugins:
 root: true
 
 rules:
-  node/no-deprecated-api: off
-  node/no-unsupported-features/es-syntax: off
-  node/no-unsupported-features/node-builtins: off
   node/no-unpublished-require: off
-  node/no-unpublished-import: off
 
   security/detect-non-literal-fs-filename: off
   security/detect-object-injection: off
 
+  eol-last: [error, always]
+  eqeqeq: error
+  no-alert: warn
+  no-console: warn
+  no-path-concat: error
   no-unused-vars: [error, {argsIgnorePattern: "^_|err|event|next|reject"}]
-  require-atomic-updates: warn
+  no-var: error
+  one-var: [error, never]
+  prefer-const: error
+  quotes: [error, single, {avoidEscape: true}]

.gitattributes

@@ -1,2 +1,2 @@
-public/locales/*/*.ftl linguist-documentation
+public/locales/* linguist-documentation
-docs/** linguist-documentation
+docs/* linguist-documentation

.gitignore

@@ -1,16 +1,2 @@
 node_modules
-coverage
 dist
-.env
-.idea
-.DS_Store
-.nyc_output
-.tox
-.pytest_cache
-*.iml
-android/app/src/main/assets
-ios/send-ios/assets/ios.js
-ios/send-ios/assets/vendor.js
-ios/send-ios.xcodeproj/project.xcworkspace/xcuserdata/*
-ios/send-ios.xcodeproj/xcuserdata/*
-test/integration/downloads

.gitlab-ci.yml

@@ -1,72 +0,0 @@
-
-stages:
-  - test
-  - release
-
-# Build Send, run npm tests
-test:
-  stage: test
-  image: "node:16-slim"
-  only:
-    - api
-    - branches
-    - chat
-    - merge_requests
-    - pushes
-    - schedules
-    - tags
-    - triggers
-    - web
-  before_script:
-    # Install dependencies
-    - apt-get update
-    - apt-get install -y git python3 build-essential libxtst6
-
-    # Prepare Chrome for puppeteer
-    - apt-get install -y wget gnupg
-    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-    - sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-    - apt-get update
-    - apt-get install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils
-    - apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
-  script:
-    - npm ci
-    - npm run lint
-    - npm test
-
-release-docker:
-  stage: release
-  image: docker:latest
-  services:
-    - docker:dind
-  only:
-    - api
-    - branches
-    - chat
-    - merge_requests
-    - pushes
-    - schedules
-    - tags
-    - triggers
-    - web
-  script:
-    - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
-    - docker buildx create --name sendBuilder
-    - docker buildx use sendBuilder
-    - |
-      if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
-        IMAGE_NAMES="$CI_REGISTRY_IMAGE/mr:$CI_MERGE_REQUEST_IID"
-      elif [ "$CI_COMMIT_TAG" != "" ]; then
-        IMAGE_NAMES="$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG $CI_REGISTRY_IMAGE:latest"
-      else
-        IMAGE_NAMES="$CI_REGISTRY_IMAGE/$CI_COMMIT_BRANCH:$CI_COMMIT_SHORT_SHA"
-      fi
-    - |
-      for image in $IMAGE_NAMES; do
-        docker buildx build --platform linux/amd64,linux/arm64 -t $image . --push
-      done
-    - |
-      echo "Container image pushed. You can pull it with";
-      for image in $IMAGE_NAMES; do
-        echo "docker pull $image"
-      done

.nsprc

@@ -0,0 +1,3 @@
+{
+  "exceptions": ["https://nodesecurity.io/advisories/534"]
+}

.prettierignore

@@ -1,4 +1,2 @@
 dist
-android/app/src/main/assets
+assets/*.js
-android/app/build
-coverage

.stylelintrc

@@ -10,6 +10,3 @@ rules:
   declaration-colon-newline-after: null
   selector-list-comma-newline-after: null
   value-list-comma-newline-after: null
-  at-rule-no-unknown: null
-  # Conflicts with prettier
-  string-quotes: null

CHANGELOG.md

@@ -1,98 +1,5 @@
 ## Change Log
 
-### v2.5.1 (2018/03/12 19:26 +00:00)
-- [#789](https://github.com/mozilla/send/pull/789) Fixed #775 : Made text not-selectable (@RCMainak)
-
-### v2.5.0 (2018/03/08 19:31 +00:00)
-- [#782](https://github.com/mozilla/send/pull/782) updated docs (@dannycoates)
-- [#781](https://github.com/mozilla/send/pull/781) Don't translate URL-safe chars, b64 is doing it for us (@timvisee)
-- [#779](https://github.com/mozilla/send/pull/779) implemented crypto polyfills for ms edge (@dannycoates)
-
-### v2.4.1 (2018/02/28 17:05 +00:00)
-- [#777](https://github.com/mozilla/send/pull/777) use a separate circle in the progress svg for indefinite progress (@dannycoates)
-
-### v2.4.0 (2018/02/27 01:55 +00:00)
-- [#769](https://github.com/mozilla/send/pull/769) removed unsafe-inline styles via svgo-loader (@dannycoates)
-- [#767](https://github.com/mozilla/send/pull/767) added coverage artifact to circleci (@dannycoates)
-- [#766](https://github.com/mozilla/send/pull/766) Some frontend unit tests [WIP] (@dannycoates)
-- [#761](https://github.com/mozilla/send/pull/761) added maxPasswordLength and passwordError messages (@dannycoates)
-- [#764](https://github.com/mozilla/send/pull/764) added indefinite progress mode (@dannycoates)
-- [#760](https://github.com/mozilla/send/pull/760) refactored css: phase 1 (@dannycoates)
-- [#759](https://github.com/mozilla/send/pull/759) Switch en-US FTL file to new syntax (@flodolo)
-- [#758](https://github.com/mozilla/send/pull/758) refactored server (@dannycoates)
-- [#757](https://github.com/mozilla/send/pull/757) Update to fluent 0.4.3 (@stasm)
-
-### v2.3.0 (2018/02/01 23:27 +00:00)
-- [#536](https://github.com/mozilla/send/pull/536) use redis expire event to delete stored data immediately (@ehuggett)
-- [#744](https://github.com/mozilla/send/pull/744) Gradient experiment (@dannycoates)
-- [#739](https://github.com/mozilla/send/pull/739) added /api/info/:id route (@dannycoates)
-- [#737](https://github.com/mozilla/send/pull/737) big refactor (@dannycoates)
-- [#722](https://github.com/mozilla/send/pull/722) Add localization note to 'Time' and 'Downloads' string (@flodolo)
-- [#721](https://github.com/mozilla/send/pull/721) show download Limits on page; Fixes #661 (@shikhar-scs)
-- [#694](https://github.com/mozilla/send/pull/694) Passwords can now be changed (#687) (@himanish-star)
-- [#702](https://github.com/mozilla/send/pull/702) Restricted the banner from showing on unsupported browsers (@himanish-star)
-- [#701](https://github.com/mozilla/send/pull/701) improved popup for mobile display; Fixes #699 (@shikhar-scs)
-- [#683](https://github.com/mozilla/send/pull/683) API changes to accommodate 3rd party clients (@ehuggett)
-- [#698](https://github.com/mozilla/send/pull/698) Popup for delete button attached (@himanish-star)
-- [#695](https://github.com/mozilla/send/pull/695) Show Warning, Cancel and Redirect on size > 2GB ; fixes #578 (@shikhar-scs)
-- [#684](https://github.com/mozilla/send/pull/684) delete btn popup attached (@himanish-star)
-- [#686](https://github.com/mozilla/send/pull/686) Hide password while Typing and after Entering: Fixes #670 (@shikhar-scs)
-- [#679](https://github.com/mozilla/send/pull/679) changed font to sans sherif: Solves #676 (@shikhar-scs)
-- [#693](https://github.com/mozilla/send/pull/693) README: Fix query link for "good first bugs" (@jspam)
-- [#685](https://github.com/mozilla/send/pull/685) checkbox now has a hover effect: fixes #635 (@himanish-star)
-- [#668](https://github.com/mozilla/send/pull/668) Add possibility to bind to a specific IP address (@TwizzyDizzy)
-- [#682](https://github.com/mozilla/send/pull/682) [Docs] - README.md - minor spelling fixes (@tmm2018)
-- [#672](https://github.com/mozilla/send/pull/672) Use EXPIRE_SECONDS to calculate file ttl for static content (@derektamsen)
-- [#680](https://github.com/mozilla/send/pull/680) adjusted line height of label : fixes #609 (@himanish-star)
-
-### v2.2.2 (2017/12/19 18:06 +00:00)
-- [#667](https://github.com/mozilla/send/pull/667) Make develop the default NODE_ENV (@claudijd)
-
-### v2.2.1 (2017/12/08 18:00 +00:00)
-- [#665](https://github.com/mozilla/send/pull/665) stop drag target from flickering when dragging over children (@ericawright)
-
-### v2.2.0 (2017/12/06 23:57 +00:00)
-- [#654](https://github.com/mozilla/send/pull/654) Multiple download UI (@dannycoates)
-- [#650](https://github.com/mozilla/send/pull/650) #634: overwrite appearance of password submit input (@ovlb)
-- [#649](https://github.com/mozilla/send/pull/649) #609 share interface: align text in input and button (@ovlb)
-
-### v2.1.2 (2017/11/16 19:03 +00:00)
-- [#645](https://github.com/mozilla/send/pull/645) Remove the leak of the password into the console (@laurentj)
-
-### v2.1.0 (2017/11/15 03:07 +00:00)
-- [#641](https://github.com/mozilla/send/pull/641) Added experiment for firefox download promo (@dannycoates)
-- [#640](https://github.com/mozilla/send/pull/640) use fluent-langneg for subtag support (@dannycoates)
-- [#639](https://github.com/mozilla/send/pull/639) wrap number localization in try/catch (@dannycoates)
-
-### v2.0.0 (2017/11/08 05:31 +00:00)
-- [#633](https://github.com/mozilla/send/pull/633) Keyboard navigation/visual feedback regression (@ehuggett)
-- [#632](https://github.com/mozilla/send/pull/632) display the 'add password' button only when the input field isn't empty (@dannycoates)
-- [#626](https://github.com/mozilla/send/pull/626) Partial fix for #623 (@ehuggett)
-- [#624](https://github.com/mozilla/send/pull/624) set a default MIME type in file metadata (@ehuggett)
-- [#612](https://github.com/mozilla/send/pull/612) Password UI nits (@dannycoates, @ericawright)
-- [#617](https://github.com/mozilla/send/pull/617) allow drag and drop if navigating from shared page (@ericawright)
-- [#608](https://github.com/mozilla/send/pull/608) disable copying link when password not completed (@ericawright)
-- [#605](https://github.com/mozilla/send/pull/605) align the "Password" and "Copy to clipboard" fields. (@ericawright)
-- [#582](https://github.com/mozilla/send/pull/582) Add optional password to the download url (@dannycoates)
-
-### v1.2.4 (2017/10/10 17:34 +00:00)
-- [#583](https://github.com/mozilla/send/pull/583) Promote the beefy UI to default (@dannycoates)
-- [#581](https://github.com/mozilla/send/pull/581) introducing ToC to README.md (@tmm2018)
-- [#579](https://github.com/mozilla/send/pull/579) Hide cancel button when upload reaches 100% (@ericawright)
-- [#580](https://github.com/mozilla/send/pull/580) Change Favicon in to look better in a variety of cases (@ericawright)
-- [#571](https://github.com/mozilla/send/pull/571) Centre logo (@ehuggett)
-- [#574](https://github.com/mozilla/send/pull/574) Make upload button focusable (accessibility/tab navigation) (@ehuggett)
-
-### v1.2.0 (2017/09/12 22:42 +00:00)
-- [#559](https://github.com/mozilla/send/pull/559) added first A/B experiment (@dannycoates)
-- [#542](https://github.com/mozilla/send/pull/542) fix docker link typo (@ehuggett)
-- [#541](https://github.com/mozilla/send/pull/541) removed .title and .alt attributes from ftl (@dannycoates)
-- [#537](https://github.com/mozilla/send/pull/537) a few changes to make A/B testing easier (@dannycoates)
-- [#533](https://github.com/mozilla/send/pull/533) minor UI fixes (@youwenliang)
-- [#531](https://github.com/mozilla/send/pull/531) Add CHANGELOG script (@pdehaan)
-- [#535](https://github.com/mozilla/send/pull/535) Fixed minimum NodeJS version in README (@LuFlo)
-- [#528](https://github.com/mozilla/send/pull/528) adding separators to README (@tmm2018)
-
 ### v1.1.1 (2017/08/17 01:29 +00:00)
 - [#516](https://github.com/mozilla/send/pull/516) cache assets (@dannycoates)
 - [#520](https://github.com/mozilla/send/pull/520) fix drag & drop (@dannycoates)

CODE_OF_CONDUCT.md

@@ -1,15 +0,0 @@
-# Community Participation Guidelines
-
-This repository is governed by Mozilla's code of conduct and etiquette guidelines. 
-For more details, please read the
-[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/). 
-
-## How to Report
-For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
-
-<!--
-## Project Specific Etiquette
-
-In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
-Please update for your project.
--->

CONTRIBUTORS

@@ -1,332 +1,92 @@
-Abd ar-Rahman Hamidi
-Abdalrahman Hwoij
-Abdulrash6211
-Abdulrasheed Idris
-Abelardo Ayala Rodríguez
 Abhinav Adduri
-Adaobi
-Adnan Kičin
-Adolfo Jayme Barrientos
-Alberto Castro
-Alexander Parada
 Alexander Slovesnik
-Alfredos-Panagiotis Damkalis
-Aman Alam
 Amin Mahmudian
-Ander Elortondo
 Andreas Pettersson
-Anesu Chiodza
-Anika Dorn
-Anish Sheela
 Arash Mousavi
-Artem Polivanchuk
-Ashesh Vidyut
-Ashikur Rahman
-Ashok kumar
-Ayobamiadebayo375
-Balasankar C
-Bald3mar
 Balázs Meskó
 Belayet Hossain
-Benjamin Forehand Jr
-Besnik Bleta
-Björn I
 Bjørn I
 Boopesh Mahendran
-Brahim Essaidi
-Brainlulz
-Breana Gonzales
-CLASSIFIED
-Christian Elbrianno
-Christoph Kührer
-Christopher Ramírez
 Chuck Harmston
-Cloney 173741
 Cláudio Esperança
-Connor Ford
-Cristian Silaghi
 Cynthia Pereira
 Daniel Thorn
 Daniela Arcese
 Danny Coates
-David Dumas
-Davide
-Derek Tamsen
-Dhyey Thakore
-Donovan Preston
-Edi Santoso
-Edmund Huggett
-Eduard Bopp
-Elisa X
-Emily
-Emily Hou
 Emin Mastizada
 Enol
 Erica
 Erica Wright
-Fauzan Alfi
-Filip Hruška
 Fjoerfoks
 Francesco Lodolo
 Francesco Lodolo [:flod]
-Frederick Villaluna
-G12r
-Gabriela
-Garysqo
 Gautam krishna.R
-George Raptis
-Georgianizator
-Gery Escalier
-Gisela Solis
-Gonçalo Matos
-Gwenn
-Hampus
-Hmxhmx
-Hrant
-Hugo
-Hugo Abreu
-Hyeonseok Shin
 Håvar Henriksen
-Ian Neal
-ItielMaN
 Jae Hyeon Park
-Jakob Kappel
 Jakub Rychlý
 Jamie
-Jan Schloß
-Jarmo
 Jim Spentzos
-Jiri Grönroos
-Jirka Soukeník
-Jobava
-Joe Becher
-Joe ST
-Joergen
 Johann-S
 John Gruen
-John Zonunmawi Vankal
-Jon Buckley
 Jon Vadillo
-Jonathan Claudius
-Jordi Cuevas
 Jordi Serratosa
-Joseph.maza
-José Manuel
-Juan Esteban Ajsivinac Sián
-Juan Pablo
-Juan Sián
-Julio Gomez
 Juraj Cigáň
-Jwtiyar
-Kerim Kalamujić
-Khaled Hosny
-Kim Ludvigsen
-Kim YoungCheon
-Kim Younggeon
 Kohei Yoshino
 Lan Glad
-Lasse Liehu
-Laurent Jouanneau
-Lobodzets
-LuFlo
-Luis A. Sánchez
-Luis Flores Martínez
-Luiz Carlos de Morais
-Luiz Felipe F M Costa
 Luna Jernberg
-Mahay Alam Khan
-Manuela Silva
-Marcelo Ghelman
 Marcelo Poli
 Marco Aurélio
-Mark Heijl
 Mark Liang
-Mark Liang (You-Wen)
-Marko Andrejić
-Martijn Dekker
-Marwan Mohamad
-Mathieu Lecarme
 Matjaž Horvat
 Maykon Chagas
-Melo46
-Merike Sell
 Michael Köhler
-Michael Peter
 Michael Wolf
 Michal Stanke
 Michal Vašíček
-Miguel
-Mikeyy
-Milo
-Miro Rauhala
-Misael Hernández
-Mozilla Pontoon
-Mozilla-GitHub-Standards
-Mozinet
 Moḥend Belqasem
-Muhend Belkacem
-Muḥend Belqasem
-Myungjae Won
-Netza López
 Nicholas Skinsacos
-Nihad
-Nihad Suljić
-Niksend Mizuhara
-Oscar
-Paulius
-Pedro Burlamaqui Bendahan
 Peter deHaan
 Pierre Neter
 Pin-guang Chen
-Piotr Drąg
-Pontoon
-Quentí
-Quế Tùng
-Rachel Tublitz
-Radu Popescu
 Rhoslyn Prys
-RickieES
-Ricky Rosario
-Rimas Kudelis
 Rizky Ariestiyansyah
-Rob Powell
-Robert
 Roberto Alvarado
 Rodrigo
-Rodrigo Guerra
 Rok Žerdin
-Romi Hardiyanto
-Rongjian Zhang
-Ruba
 Sahithi
 Sairam Raavi
-Sander Lepik
 Sandro
-Sara Todaro
-Sav22999
 Schieck :)
 Selim Şumlu
-Selyan Sliman Amiri
-Selyan Slimane Amiri
-Sidak Singh Aulakh
 Slimane Amiri
-Slimane Selyan AMIRI
-Soumya Himanish Mohapatra
-Staś Małolepszy
-Suriyaa ✌️️
-Tema
-Thomas Dalichow
 Théo Chevalier
-Tiago Morais Morgado
-Tim Visée
-Tomer Cohen
 Tomáš Zelina
 Ton
-Top
 Tymur Faradzhev
-Uccen Marzuq
-Umegbewe
 Varghese Thomas
 Victor Bychek
-Victor Davila
-Victor Ibragimov
-Vimal Raghubir
-Vitaliy Krutko
 Weihang Lo
-Wiktor Furman
 Wil Clouser
 YFdyh000
-Yassine Aït-El-Mouden
-Yongmin H
 You-Wen Liang (Mark)
-Zhenya Tikhonov
-ZiriSut
-aaaaalbert
-abtin
-ada_okeke60
-aefgh39622
-alamanda
-albertdcastro
 alex_mayorga
-ali.malek.71
 ariestiyansyah
 avelper
-biobell2000
-bulut
-chilledfrogs
-clouserw-mozilla-owner
-dependabot[bot]
 dgadelha
-dskmori
 ehuggett
-elenatambriz
 eljuno
-emily-hou1
 erdem cobanoglu
-fcortess
 gautamkrishnar
-gmontagu
 goofy
-hello
 hi
-ivan.pompa
-jackyzy823
 jesferman1993
-jlG
-jnunezf96
-johngruen
 josotrix
-jspam
-julen
-julenx
 kenrick95
-kumincir
-leo.toneff
-m4hdi.pdroid
-mail
-manuel padilla sanchez
 manxmensch
-marigalicer
-marsf
-merianosnikos
-minvs1
-mirzet.omerovic.1992
-mujeebcpy
-okyanusoz
-p.sanroman.bengoetxea
-passionforlife
-paul.trevor
-pyup.io bot
 ravmn
-rcmainak
 reza.habibi2008
-rgpublic
-risger
-robbp
-ruikunai
-savemore99.sm
-sergio
-shamanchic2011
-shikhar-scs
 siparon
 skystar-p
-stripTM
-sugabelly
-tatalmondmush
-tiagomoraismorgado
-timvisee
-victor.gonzalezro
 xcffl
-ybouhamam
-yoshimitsu002
-yusup.ramdani
-zankomhamad
 Μιχάλης
 Марко Костић (Marko Kostić)
-Ратко Вујановић
-صفا الفليج
-వీవెన్
-ജോയ്സ്
-张无忌
-新垣结衣松冈茉优长泽雅美门胁麦上野树里石原里美
-莫非前世那一眼

Dockerfile

@@ -1,73 +1,15 @@
-##
+FROM node:8-alpine
-# Send
-#
-# License https://gitlab.com/timvisee/send/blob/master/LICENSE
-##
-
-# Build project
-FROM node:16.13-alpine3.13 AS builder
-
-RUN set -x \
-  # Change node uid/gid
-  && apk --no-cache add shadow \
-  && groupmod -g 1001 node \
-  && usermod -u 1001 -g 1001 node
-
-RUN set -x \
-    # Add user
-    && addgroup --gid 1000 app \
-    && adduser --disabled-password \
-        --gecos '' \
-        --ingroup app \
-        --home /app \
-        --uid 1000 \
-        app
-
-COPY --chown=app:app . /app
 
+RUN apk add --no-cache git
+RUN addgroup -S -g 10001 app && adduser -S -D -G app -u 10001 app
+COPY . /app
+RUN chown -R app /app
 USER app
 WORKDIR /app
-
+RUN mkdir static
-RUN set -x \
+RUN npm install --production && npm cache clean --force
-    # Build
-    && PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm ci \
-    && npm run build
-
-# Main image
-FROM node:16.13-alpine3.13
-
-RUN set -x \
-  # Change node uid/gid
-  && apk --no-cache add shadow \
-  && groupmod -g 1001 node \
-  && usermod -u 1001 -g 1001 node
-
-RUN set -x \
-    # Add user
-    && addgroup --gid 1000 app \
-    && adduser --disabled-password \
-        --gecos '' \
-        --ingroup app \
-        --home /app \
-        --uid 1000 \
-        app
-
-USER app
-WORKDIR /app
-
-COPY --chown=app:app package*.json ./
-COPY --chown=app:app app app
-COPY --chown=app:app common common
-COPY --chown=app:app public/locales public/locales
-COPY --chown=app:app server server
-COPY --chown=app:app --from=builder /app/dist dist
-
-RUN npm ci --production && npm cache clean --force
-RUN mkdir -p /app/.config/configstore
-RUN ln -s dist/version.json version.json
 
 ENV PORT=1443
+EXPOSE $PORT
 
-EXPOSE ${PORT}
+CMD ["npm", "run", "prod"]
-
-CMD ["node", "server/bin/prod.js"]

README.md

@@ -1,59 +1,9 @@
-# [![Send](./assets/icon-64x64.png)](https://gitlab.com/timvisee/send/) Send
+# Firefox Send
 
-[![Build status on GitLab CI][gitlab-ci-master-badge]][gitlab-ci-link]
+[![CircleCI](https://img.shields.io/circleci/project/github/mozilla/send.svg)](https://circleci.com/gh/mozilla/send)
-[![Latest release][release-badge]][release-link]
+[![Available on Test Pilot](https://img.shields.io/badge/available_on-Test_Pilot-0996F8.svg)](https://testpilot.firefox.com/experiments/send)
-[![Docker image][docker-image-badge]][docker-image-link]
-[![Project license][repo-license-badge]](LICENSE)
 
-[docker-image-badge]: https://img.shields.io/badge/docker-latest-blue.svg
+**Docs:** [Docker](docs/docker.md), [Metrics](docs/metrics.md)
-[docker-image-link]: https://gitlab.com/timvisee/send/container_registry/eyJuYW1lIjoidGltdmlzZWUvc2VuZCIsInRhZ3NfcGF0aCI6Ii90aW12aXNlZS9zZW5kL3JlZ2lzdHJ5L3JlcG9zaXRvcnkvMTQxODUwNC90YWdzP2Zvcm1hdD1qc29uIiwiaWQiOjE0MTg1MDQsImNsZWFudXBfcG9saWN5X3N0YXJ0ZWRfYXQiOm51bGx9
-[gitlab-ci-link]: https://gitlab.com/timvisee/send/pipelines
-[gitlab-ci-master-badge]: https://gitlab.com/timvisee/send/badges/master/pipeline.svg
-[release-badge]: https://img.shields.io/github/v/tag/timvisee/send
-[release-link]: https://gitlab.com/timvisee/send/-/tags
-[repo-license-badge]: https://img.shields.io/github/license/timvisee/send.svg
-
-A fork of Mozilla's [Firefox Send][mozilla-send].
-Mozilla discontinued Send, this fork is a community effort to keep the project
-up-to-date and alive.
-
-- Forked [at][fork-commit] Mozilla's last publicly hosted version
-- _Mozilla_ & _Firefox_ branding [is][remove-branding-pr] removed so you can legally self-host
-- Kept compatible with [`ffsend`][ffsend] (CLI for Send)
-- Dependencies have been updated
-- Mozilla's [changes][mozilla-patches] since the fork have been selectively [merged][mozilla-patches-pr]
-- Mozilla's experimental report feature, download tokens, trust warnings and FxA changes are not included
-
-Find an up-to-date Docker image here: [docs/docker.md](docs/docker.md)
-
-The original project by Mozilla can be found [here][mozilla-send].
-The [`mozilla-master`][branch-mozilla-master] branch holds the `master` branch
-as left by Mozilla.
-The [`send-v3`][branch-send-v3] branch holds the commit tree of Mozilla's last
-publicly hosted version, which this fork is based on.
-The [`send-v4`][branch-send-v4] branch holds the commit tree of Mozilla's last
-experimental version which was still a work in progress (featuring file
-reporting, download tokens, trust warnings and FxA changes), this has
-selectively been merged into this fork.
-Please consider to [donate][donate] to allow me to keep working on this.
-
-Thanks [Mozilla][mozilla] for building this amazing tool!
-
-[branch-mozilla-master]: https://gitlab.com/timvisee/send/-/tree/mozilla-master
-[branch-send-v3]: https://gitlab.com/timvisee/send/-/tree/send-v3
-[branch-send-v4]: https://gitlab.com/timvisee/send/-/tree/send-v4
-[donate]: https://timvisee.com/donate
-[ffsend]: https://github.com/timvisee/ffsend
-[fork-commit]: https://gitlab.com/timvisee/send/-/commit/3e9be676413a6e1baaf6a354c180e91899d10bec
-[mozilla-patches-pr]: https://gitlab.com/timvisee/send/-/merge_requests/3
-[mozilla-patches]: https://gitlab.com/timvisee/send/-/compare/3e9be676413a6e1baaf6a354c180e91899d10bec...mozilla-master
-[mozilla-send]: https://github.com/mozilla/send
-[mozilla]: https://mozilla.org/
-[remove-branding-pr]: https://gitlab.com/timvisee/send/-/merge_requests/2
-
----
-
-**Docs:** [FAQ](docs/faq.md), [Encryption](docs/encryption.md), [Build](docs/build.md), [Docker](docs/docker.md), [More](docs/)
 
 ---
 
@@ -66,9 +16,7 @@ Thanks [Mozilla][mozilla] for building this amazing tool!
 * [Configuration](#configuration)
 * [Localization](#localization)
 * [Contributing](#contributing)
-* [Instances](#instances)
+* [Testing](#testing)
-* [Deployment](#deployment)
-* [Clients](#clients)
 * [License](#license)
 
 ---
@@ -81,22 +29,22 @@ A file sharing experiment which allows you to send encrypted files to other user
 
 ## Requirements
 
-- [Node.js 16.x](https://nodejs.org/)
+- [Node.js 8.2+](https://nodejs.org/)
 - [Redis server](https://redis.io/) (optional for development)
-- [AWS S3](https://aws.amazon.com/s3/) or compatible service (optional)
+- [AWS S3](https://aws.amazon.com/s3/) or compatible service. (optional)
 
 ---
 
 ## Development
 
-To start an ephemeral development server, run:
+To start an ephemeral development server run:
 
 ```sh
 npm install
 npm start
 ```
 
-Then, browse to http://localhost:8080
+Then browse to http://localhost:8080
 
 ---
 
@@ -121,45 +69,23 @@ The server is configured with environment variables. See [server/config.js](serv
 
 ## Localization
 
-See: [docs/localization.md](docs/localization.md)
+Firefox Send localization is managed via [Pontoon](https://pontoon.mozilla.org/projects/test-pilot-firefox-send/), not direct pull requests to the repository. If you want to fix a typo, add a new language, or simply know more about localization, please get in touch with the [existing localization team](https://pontoon.mozilla.org/teams/) for your language, or Mozilla’s [l10n-drivers](https://wiki.mozilla.org/L10n:Mozilla_Team#Mozilla_Corporation) for guidance.
 
 ---
 
 ## Contributing
 
-Pull requests are always welcome! Feel free to check out the list of "good first issues" (to be implemented).
+Pull requests are always welcome! Feel free to check out the list of ["good first bugs"](https://github.com/mozilla/send/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22).
 
 ---
 
-## Instances
+## Testing
 
-Find a list of public instances here: https://github.com/timvisee/send-instances/
+| ENVIRONMENT | URL
-
+|-------------|-----
----
+| Production  | <https://send.firefox.com/>
-
+| Stage       | <https://send.stage.mozaws.net/>
-## Deployment
+| Development | <https://send.dev.mozaws.net/>
-
-See: [docs/deployment.md](docs/deployment.md)
-
-Docker quickstart: [docs/docker.md](docs/docker.md)
-
-AWS example using Ubuntu Server `20.04`: [docs/AWS.md](docs/AWS.md)
-
----
-
-## Clients
-
-- Web: _this repository_
-- Command-line: [`ffsend`](https://github.com/timvisee/ffsend)
-- Android: _see [Android](#android) section_
-- Thunderbird: [FileLink provider for Send](https://addons.thunderbird.net/thunderbird/addon/filelink-provider-for-send/)
-
-#### Android
-
-The android implementation is contained in the `android` directory,
-and can be viewed locally for easy testing and editing by running `ANDROID=1 npm
-start` and then visiting <http://localhost:8080>. CSS and image files are
-located in the `android/app/src/main/assets` directory.
 
 ---
 
@@ -167,6 +93,4 @@ located in the `android/app/src/main/assets` directory.
 
 [Mozilla Public License Version 2.0](LICENSE)
 
-[qrcode.js](https://github.com/kazuhikoarase/qrcode-generator) licensed under MIT
-
 ---

android/.eslintrc.yaml

@@ -1,6 +0,0 @@
-env:
-  browser: true
-
-parserOptions:
-  sourceType: module
-

android/.gitignore

@@ -1,4 +0,0 @@
-local.properties
-.gradle
-build
-

android/README.md

@@ -1,9 +0,0 @@
-Readme
-=====
-
-The Send Android app allows you to choose any file from your android device, encrypt it with a password, and get a URL which will allow secure download of the file. By default, this URL will expire after one download or 24 hours.
-
-Building the Send Android app.
-=====
-
-First, install Android Studio. Open the `android` directory in Android Studio, plug in your android phone, and press the run button.

android/SendAndroid.iml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="SendAndroid" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

android/android.js

@@ -1,99 +0,0 @@
-import 'intl-pluralrules';
-import choo from 'choo';
-import html from 'choo/html';
-import * as Sentry from '@sentry/browser';
-
-import { setApiUrlPrefix, getConstants } from '../app/api';
-//import assets from '../common/assets';
-import Archive from '../app/archive';
-import Header from '../app/ui/header';
-import storage from '../app/storage';
-import controller from '../app/controller';
-import User from './user';
-import intents from './stores/intents';
-import home from './pages/home';
-import upload from './pages/upload';
-import share from './pages/share';
-import preferences from './pages/preferences';
-import error from './pages/error';
-import { getTranslator } from '../app/locale';
-import { setTranslate } from '../app/utils';
-
-import { delay } from '../app/utils';
-
-if (navigator.userAgent === 'Send Android') {
-  setApiUrlPrefix('https://send.firefox.com');
-}
-
-const app = choo();
-//app.use(state);
-app.use(controller);
-app.use(intents);
-
-window.finishLogin = async function(accountInfo) {
-  while (!(app.state && app.state.user)) {
-    await delay();
-  }
-  await app.state.user.finishLogin(accountInfo);
-  await app.state.user.syncFileList();
-  app.emitter.emit('replaceState', '/');
-};
-
-function body(main) {
-  return function(state, emit) {
-    /*
-      Disable the preferences menu for now since it is ugly and isn't
-      relevant to the beta
-    function clickPreferences(event) {
-      event.preventDefault();
-      emit('pushState', '/preferences');
-    }
-
-    const menu = html`<a
-        id="hamburger"
-        class="absolute top-0 right-0 z-50"
-        href="#"
-        onclick="${clickPreferences}"
-      >
-        <img src="${assets.get('preferences.png')}" />
-      </a>`;
-    */
-    return html`
-      <body class="flex flex-col items-center font-sans bg-grey-10 h-screen">
-        ${state.cache(Header, 'header').render()} ${main(state, emit)}
-      </body>
-    `;
-  };
-}
-(async function start() {
-  const translate = await getTranslator('en-US');
-  setTranslate(translate);
-  const { LIMITS, WEB_UI, DEFAULTS } = await getConstants();
-  app.use(state => {
-    state.LIMITS = LIMITS;
-    state.WEB_UI = WEB_UI;
-    state.DEFAULTS = DEFAULTS;
-    state.translate = translate;
-    state.capabilities = {
-      account: true
-    }; //TODO
-    state.archive = new Archive(
-      [],
-      DEFAULTS.EXPIRE_SECONDS,
-      DEFAULTS.DOWNLOADS
-    );
-    state.storage = storage;
-    state.user = new User(storage, LIMITS);
-    state.sentry = Sentry;
-  });
-  app.route('/', body(home));
-  app.route('/upload', upload);
-  app.route('/share/:id', share);
-  app.route('/preferences', preferences);
-  app.route('/error', error);
-  //app.route('/debugging', require('./pages/debugging').default);
-  // add /api/filelist
-  app.mount('body');
-})();
-
-window.app = app;

android/app/.gitignore

@@ -1 +0,0 @@
-/build

android/app/build.gradle

@@ -1,41 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-android {
-    compileSdkVersion 27
-    defaultConfig {
-        applicationId "org.mozilla.firefoxsend"
-        minSdkVersion 26
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.github.delight-im:Android-AdvancedWebView:v3.0.0'
-    implementation "org.mozilla.components:service-firefox-accounts:$android_components_version"
-}
-
-task generateAndLinkBundle(type: Exec, description: 'Generate the android.js bundle and link it into the assets directory') {
-    commandLine './buildAssets.sh'
-}
-
-tasks.withType(JavaCompile) {
-    compileTask -> compileTask.dependsOn generateAndLinkBundle
-}

android/app/buildAssets.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-if [ -d "../../node_modules" ]
-then
-  echo "node_modules already present."
-else
-  echo "node_modules not present, running npm install."
-  npm install
-fi
-npm run build
-rm -rf src/main/assets
-mkdir -p src/main/assets
-cp -R ../../dist/* src/main/assets

android/app/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

android/app/src/main/AndroidManifest.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.firefoxsend">
-
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing" android:value="false" />
-        <activity android:name="org.mozilla.firefoxsend.MainActivity" android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>

android/app/src/main/java/org/mozilla/firefoxsend/MainActivity.kt

@@ -1,226 +0,0 @@
-package org.mozilla.firefoxsend
-
-import android.annotation.SuppressLint
-import android.content.ComponentName
-import android.content.Intent
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.util.Base64
-import android.util.Log
-import android.view.View
-import android.webkit.*
-import im.delight.android.webview.AdvancedWebView
-import kotlinx.android.synthetic.main.activity_main.*
-import mozilla.components.service.fxa.Config
-import mozilla.components.service.fxa.FirefoxAccount
-import mozilla.components.service.fxa.FxaResult
-import org.json.JSONObject
-
-internal class LoggingWebChromeClient : WebChromeClient() {
-    override fun onConsoleMessage(cm: ConsoleMessage): Boolean {
-        Log.d(TAG, String.format("%s @ %d: %s",
-                cm.message(), cm.lineNumber(), cm.sourceId()))
-        return true
-    }
-
-    companion object {
-        private const val TAG = "CONTENT"
-    }
-}
-
-class WebAppInterface(private val mContext: MainActivity) {
-    @JavascriptInterface
-    fun beginOAuthFlow() {
-        mContext.beginOAuthFlow()
-    }
-
-    @JavascriptInterface
-    fun shareUrl(url: String) {
-        mContext.shareUrl(url)
-    }
-}
-
-class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
-
-    private var mToShare: String? = null
-    private var mToCall: String? = null
-    private var mAccount: FirefoxAccount? = null
-
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
-        webView.apply {
-            setListener(this@MainActivity, this@MainActivity)
-            addJavascriptInterface(WebAppInterface(this@MainActivity), JS_INTERFACE_NAME)
-            setLayerType(View.LAYER_TYPE_HARDWARE, null)
-            webChromeClient = LoggingWebChromeClient()
-
-            settings.apply {
-                userAgentString = "Send Android"
-                allowUniversalAccessFromFileURLs = true
-                javaScriptEnabled = true
-            }
-        }
-
-        val type = intent.type
-        if (Intent.ACTION_SEND == intent.action && type != null) {
-            if (type == "text/plain") {
-                val sharedText = intent.getStringExtra(Intent.EXTRA_TEXT)
-                // Log.d(TAG_INTENT, "text/plain $sharedText")
-                mToShare = "data:text/plain;base64," + Base64.encodeToString(sharedText.toByteArray(), 16).trim()
-            } else if (type.startsWith("image/")) {
-                val imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM) as Uri
-                // Log.d(TAG_INTENT, "image/ $imageUri")
-                mToShare = "data:text/plain;base64," + Base64.encodeToString(imageUri.path.toByteArray(), 16).trim()
-            }
-        }
-        webView.loadUrl("file:///android_asset/android.html")
-    }
-
-    fun beginOAuthFlow() {
-        Config.release().then { value ->
-            mAccount = FirefoxAccount(value, "20f7931c9054d833", "https://send.firefox.com/fxa/android-redirect.html")
-            mAccount?.beginOAuthFlow(arrayOf("profile", "https://identity.mozilla.com/apps/send"), true)
-                    ?.then { url ->
-                        // Log.d(TAG_CONFIG, "GOT A URL $url")
-                        this@MainActivity.runOnUiThread {
-                            webView.loadUrl(url)
-                        }
-                        FxaResult.fromValue(Unit)
-                    }
-            // Log.d(TAG_CONFIG, "CREATED FIREFOXACCOUNT")
-            FxaResult.fromValue(Unit)
-        }
-    }
-
-    fun shareUrl(url: String) {
-        val shareIntent = Intent().apply {
-            action = Intent.ACTION_SEND
-            type = "text/plain"
-            putExtra(Intent.EXTRA_TEXT, url)
-        }
-
-        val components = arrayOf(ComponentName(applicationContext, MainActivity::class.java))
-        val chooser = Intent.createChooser(shareIntent, "")
-                .putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, components)
-
-        startActivity(chooser)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        webView.onResume()
-    }
-
-    override fun onPause() {
-        webView.onPause()
-        super.onPause()
-    }
-
-    override fun onDestroy() {
-        webView.onDestroy()
-        super.onDestroy()
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-        super.onActivityResult(requestCode, resultCode, intent)
-        webView.onActivityResult(requestCode, resultCode, intent)
-    }
-
-    override fun onBackPressed() {
-        if (!webView.onBackPressed()) {
-            return
-        }
-        super.onBackPressed()
-    }
-
-    override fun onPageStarted(url: String, favicon: Bitmap?) {
-        if (url.startsWith("https://send.firefox.com/fxa/android-redirect.html")) {
-            // We load this here so the user doesn't see the android-redirect.html page
-            webView.loadUrl("file:///android_asset/android.html")
-
-            val uri = Uri.parse(url)
-            uri.getQueryParameter("code")?.let { code ->
-                uri.getQueryParameter("state")?.let { state ->
-                    mAccount?.completeOAuthFlow(code, state)?.whenComplete { info ->
-                        mAccount?.getProfile(false)?.then { profile ->
-                            val profileJsonPayload = JSONObject()
-                                    .put("accessToken", info.accessToken)
-                                    .put("keys", info.keys)
-                                    .put("avatar", profile.avatar)
-                                    .put("displayName", profile.displayName)
-                                    .put("email", profile.email)
-                                    .put("uid", profile.uid).toString()
-                            mToCall = "finishLogin($profileJsonPayload)"
-                            this@MainActivity.runOnUiThread {
-                                // Clear the history so that the user can't use the back button to see broken pages
-                                // that were inserted into the history by the login process.
-                                webView.clearHistory()
-
-                                // We also reload this here because we need to make sure onPageFinished runs after mToCall has been set.
-                                // We can't guarantee that onPageFinished wasn't already called at this point.
-                                webView.loadUrl("file:///android_asset/android.html")
-                            }
-                            FxaResult.fromValue(Unit)
-                        }
-                    }
-                }
-            }
-        }
-        if (!url.startsWith("file:///android_asset/") && !url.startsWith("https://accounts.firefox.com/")) {
-            // Don't allow loading anything other than the app in our webview
-            // It should be possible to do this with shouldOverrideUrlLoading
-            // but it didn't seem to be working, so this works as a hack.
-            webView.loadUrl("file:///android_asset/android.html")
-            Log.d(TAG_MAIN, "BAD URL " + url)
-        } else {
-            // Log.d(TAG_MAIN, "onPageStarted " + url)
-        }
-    }
-
-    override fun onPageFinished(url: String) {
-        // Log.d(TAG_MAIN, "onPageFinished")
-        if (mToShare != null) {
-            // Log.d(TAG_INTENT, mToShare)
-
-            webView.postWebMessage(WebMessage(mToShare), Uri.EMPTY)
-            mToShare = null
-        }
-        if (mToCall != null) {
-            this@MainActivity.runOnUiThread {
-                webView.evaluateJavascript(mToCall) {
-                    mToCall = null
-                }
-            }
-        }
-    }
-
-    override fun onPageError(errorCode: Int, description: String, failingUrl: String) {
-        Log.d(TAG_MAIN, "onPageError($errorCode, $description, $failingUrl)")
-    }
-
-    override fun onDownloadRequested(url: String,
-                                     suggestedFilename: String,
-                                     mimeType: String,
-                                     contentLength: Long,
-                                     contentDisposition: String,
-                                     userAgent: String) {
-        // Log.d(TAG_MAIN, "onDownloadRequested")
-    }
-
-    override fun onExternalPageRequest(url: String) {
-        // Log.d(TAG_MAIN, "onExternalPageRequest($url)")
-    }
-
-    companion object {
-        private const val TAG_MAIN = "MAIN"
-        private const val TAG_INTENT = "INTENT"
-        private const val TAG_CONFIG = "CONFIG"
-        private const val JS_INTERFACE_NAME = "Android"
-    }
-}

android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,97 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:aapt="http://schemas.android.com/aapt"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="92.5"
-        android:viewportHeight="92.5">
-    <group android:translateX="27.75"
-            android:translateY="28.25">
-      <path
-          android:pathData="M18.1313,0.0003C8.1363,0.0003 0.0003,7.9743 0.0003,17.7673C0.0003,18.8133 0.8523,19.6643 1.8983,19.6643L16.2333,19.6643L16.2333,29.1093L11.7773,24.6963C11.0413,23.9613 9.8403,23.9613 9.0653,24.6963C8.3293,25.4323 8.3293,26.6323 9.0653,27.4063L16.7753,35.1093C16.8143,35.1483 16.8533,35.1873 16.9303,35.2253L16.9693,35.2253C17.0083,35.2643 17.0463,35.3033 17.0853,35.3033L17.1243,35.3033C17.1633,35.3423 17.2013,35.3423 17.2403,35.3803L17.2793,35.3803C17.3183,35.4193 17.3953,35.4193 17.4343,35.4583C17.4733,35.4963 17.5503,35.4963 17.5893,35.4963C17.6283,35.4963 17.7053,35.5353 17.7443,35.5353L17.7823,35.5353C17.8213,35.5353 17.8603,35.5353 17.9373,35.5743L18.3253,35.5743C18.3643,35.5743 18.4023,35.5743 18.4803,35.5353L18.5193,35.5353C18.5573,35.5353 18.6353,35.4963 18.6743,35.4963C18.7123,35.4963 18.7903,35.4583 18.8293,35.4193C18.8673,35.3803 18.9453,35.3803 18.9843,35.3423C19.0223,35.3033 19.0613,35.3033 19.1003,35.2643L19.1383,35.2643C19.1773,35.2253 19.2163,35.1873 19.2553,35.1873L19.2933,35.1873C19.3323,35.1483 19.3713,35.1093 19.4483,35.0713L27.1583,27.3673C27.8943,26.6323 27.8943,25.4323 27.1583,24.6583C26.4223,23.9223 25.2213,23.9223 24.4463,24.6583L20.0303,29.1093L20.0303,19.7033L34.3643,19.7033C35.4103,19.7033 36.2633,18.8513 36.2633,17.8063C36.2633,7.9743 28.1273,0.0003 18.1313,0.0003ZM3.9133,15.8713C4.8813,9.0963 10.8863,3.8323 18.1313,3.8323C25.3763,3.8323 31.3423,9.0963 32.3113,15.8713L3.9133,15.8713Z"
-          android:fillType="nonZero">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:startY="2.9809632"
-              android:startX="25.805717"
-              android:endY="31.687763"
-              android:endX="8.569217"
-              android:type="linear">
-            <item android:offset="0" android:color="#FFFF980E"/>
-            <item android:offset="0.21" android:color="#FFFF7139"/>
-            <item android:offset="0.36" android:color="#FFFF5854"/>
-            <item android:offset="0.46" android:color="#FFFF4F5E"/>
-            <item android:offset="0.69" android:color="#FFFF3750"/>
-            <item android:offset="0.86" android:color="#FFF92261"/>
-            <item android:offset="1" android:color="#FFF5156C"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M18.1313,0.0003C8.1363,0.0003 0.0003,7.9743 0.0003,17.7673C0.0003,18.8133 0.8523,19.6643 1.8983,19.6643L16.2333,19.6643L16.2333,29.1093L11.7773,24.6963C11.0413,23.9613 9.8403,23.9613 9.0653,24.6963C8.3293,25.4323 8.3293,26.6323 9.0653,27.4063L16.7753,35.1093C16.8143,35.1483 16.8533,35.1873 16.9303,35.2253L16.9693,35.2253C17.0083,35.2643 17.0463,35.3033 17.0853,35.3033L17.1243,35.3033C17.1633,35.3423 17.2013,35.3423 17.2403,35.3803L17.2793,35.3803C17.3183,35.4193 17.3953,35.4193 17.4343,35.4583C17.4733,35.4963 17.5503,35.4963 17.5893,35.4963C17.6283,35.4963 17.7053,35.5353 17.7443,35.5353L17.7823,35.5353C17.8213,35.5353 17.8603,35.5353 17.9373,35.5743L18.3253,35.5743C18.3643,35.5743 18.4023,35.5743 18.4803,35.5353L18.5193,35.5353C18.5573,35.5353 18.6353,35.4963 18.6743,35.4963C18.7123,35.4963 18.7903,35.4583 18.8293,35.4193C18.8673,35.3803 18.9453,35.3803 18.9843,35.3423C19.0223,35.3033 19.0613,35.3033 19.1003,35.2643L19.1383,35.2643C19.1773,35.2253 19.2163,35.1873 19.2553,35.1873L19.2933,35.1873C19.3323,35.1483 19.3713,35.1093 19.4483,35.0713L27.1583,27.3673C27.8943,26.6323 27.8943,25.4323 27.1583,24.6583C26.4223,23.9223 25.2213,23.9223 24.4463,24.6583L20.0303,29.1093L20.0303,19.7033L34.3643,19.7033C35.4103,19.7033 36.2633,18.8513 36.2633,17.8063C36.2633,7.9743 28.1273,0.0003 18.1313,0.0003ZM3.9133,15.8713C4.8813,9.0963 10.8863,3.8323 18.1313,3.8323C25.3763,3.8323 31.3423,9.0963 32.3113,15.8713L3.9133,15.8713Z"
-          android:fillType="nonZero">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:startY="2.9809632"
-              android:startX="25.805717"
-              android:endY="31.687763"
-              android:endX="8.569217"
-              android:type="linear">
-            <item android:offset="0" android:color="#CCFFF44F"/>
-            <item android:offset="0.75" android:color="#00FFF44F"/>
-            <item android:offset="1" android:color="#00FFF44F"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M20.0303,3.9483C26.3833,4.8003 31.4203,9.6773 32.3113,15.8713L23.8653,15.8713C21.7733,15.8713 20.0683,17.5743 20.0683,19.6643L34.3643,19.6643C35.4103,19.6643 36.2633,18.8133 36.2633,17.7673C36.2633,10.9933 31.4593,7.6643 27.3913,5.7673C23.6333,4.0253 20.0303,3.9483 20.0303,3.9483Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:startY="20.534323"
-              android:startX="22.366518"
-              android:endY="7.772023"
-              android:endX="30.234228"
-              android:type="linear">
-            <item android:offset="0" android:color="#FF3A8EE6"/>
-            <item android:offset="0.24" android:color="#FF5C79F0"/>
-            <item android:offset="0.63" android:color="#FF9059FF"/>
-            <item android:offset="1" android:color="#FFC139E6"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M32.2333,15.4453C33.5123,16.4903 34.8293,17.4963 36.0693,18.5803C36.1853,18.3483 36.2633,18.0773 36.2633,17.7673C36.2633,10.9933 31.4593,7.6643 27.3913,5.7673C23.6333,4.0253 20.0303,3.9483 20.0303,3.9483C26.2283,4.7613 31.1873,9.4843 32.2333,15.4453Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:startY="8.195093"
-              android:startX="30.235817"
-              android:endY="12.836453"
-              android:endX="26.934916"
-              android:type="linear">
-            <item android:offset="0" android:color="#7E6E008B"/>
-            <item android:offset="0.5" android:color="#00C846CB"/>
-            <item android:offset="1" android:color="#00C846CB"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M32.0013,15.8713L23.8653,15.8713C21.7733,15.8713 20.0683,17.5743 20.0683,19.6643L34.3643,19.6643C34.9453,19.6643 35.4883,19.3933 35.8373,18.9673C34.5583,17.9223 33.2793,16.9163 32.0013,15.8713Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:startY="18.076923"
-              android:startX="31.69962"
-              android:endY="17.594997"
-              android:endX="23.366179"
-              android:type="linear">
-            <item android:offset="0" android:color="#006A2BEA"/>
-            <item android:offset="0.14" android:color="#006A2BEA"/>
-            <item android:offset="0.3" android:color="#15662CE6"/>
-            <item android:offset="0.47" android:color="#2C592FDB"/>
-            <item android:offset="0.64" android:color="#424534C9"/>
-            <item android:offset="0.82" android:color="#59283BAF"/>
-            <item android:offset="0.99" android:color="#7003448D"/>
-            <item android:offset="1" android:color="#7200458B"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-    </group>
-</vector>

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,97 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="92.5"
-    android:viewportHeight="92.5">
-  <group android:translateX="27.75"
-      android:translateY="28.25">
-    <path
-        android:pathData="M18.1313,0.0003C8.1363,0.0003 0.0003,7.9743 0.0003,17.7673C0.0003,18.8133 0.8523,19.6643 1.8983,19.6643L16.2333,19.6643L16.2333,29.1093L11.7773,24.6963C11.0413,23.9613 9.8403,23.9613 9.0653,24.6963C8.3293,25.4323 8.3293,26.6323 9.0653,27.4063L16.7753,35.1093C16.8143,35.1483 16.8533,35.1873 16.9303,35.2253L16.9693,35.2253C17.0083,35.2643 17.0463,35.3033 17.0853,35.3033L17.1243,35.3033C17.1633,35.3423 17.2013,35.3423 17.2403,35.3803L17.2793,35.3803C17.3183,35.4193 17.3953,35.4193 17.4343,35.4583C17.4733,35.4963 17.5503,35.4963 17.5893,35.4963C17.6283,35.4963 17.7053,35.5353 17.7443,35.5353L17.7823,35.5353C17.8213,35.5353 17.8603,35.5353 17.9373,35.5743L18.3253,35.5743C18.3643,35.5743 18.4023,35.5743 18.4803,35.5353L18.5193,35.5353C18.5573,35.5353 18.6353,35.4963 18.6743,35.4963C18.7123,35.4963 18.7903,35.4583 18.8293,35.4193C18.8673,35.3803 18.9453,35.3803 18.9843,35.3423C19.0223,35.3033 19.0613,35.3033 19.1003,35.2643L19.1383,35.2643C19.1773,35.2253 19.2163,35.1873 19.2553,35.1873L19.2933,35.1873C19.3323,35.1483 19.3713,35.1093 19.4483,35.0713L27.1583,27.3673C27.8943,26.6323 27.8943,25.4323 27.1583,24.6583C26.4223,23.9223 25.2213,23.9223 24.4463,24.6583L20.0303,29.1093L20.0303,19.7033L34.3643,19.7033C35.4103,19.7033 36.2633,18.8513 36.2633,17.8063C36.2633,7.9743 28.1273,0.0003 18.1313,0.0003ZM3.9133,15.8713C4.8813,9.0963 10.8863,3.8323 18.1313,3.8323C25.3763,3.8323 31.3423,9.0963 32.3113,15.8713L3.9133,15.8713Z"
-        android:fillType="nonZero">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="2.9809632"
-            android:startX="25.805717"
-            android:endY="31.687763"
-            android:endX="8.569217"
-            android:type="linear">
-          <item android:offset="0" android:color="#FFFF980E"/>
-          <item android:offset="0.21" android:color="#FFFF7139"/>
-          <item android:offset="0.36" android:color="#FFFF5854"/>
-          <item android:offset="0.46" android:color="#FFFF4F5E"/>
-          <item android:offset="0.69" android:color="#FFFF3750"/>
-          <item android:offset="0.86" android:color="#FFF92261"/>
-          <item android:offset="1" android:color="#FFF5156C"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M18.1313,0.0003C8.1363,0.0003 0.0003,7.9743 0.0003,17.7673C0.0003,18.8133 0.8523,19.6643 1.8983,19.6643L16.2333,19.6643L16.2333,29.1093L11.7773,24.6963C11.0413,23.9613 9.8403,23.9613 9.0653,24.6963C8.3293,25.4323 8.3293,26.6323 9.0653,27.4063L16.7753,35.1093C16.8143,35.1483 16.8533,35.1873 16.9303,35.2253L16.9693,35.2253C17.0083,35.2643 17.0463,35.3033 17.0853,35.3033L17.1243,35.3033C17.1633,35.3423 17.2013,35.3423 17.2403,35.3803L17.2793,35.3803C17.3183,35.4193 17.3953,35.4193 17.4343,35.4583C17.4733,35.4963 17.5503,35.4963 17.5893,35.4963C17.6283,35.4963 17.7053,35.5353 17.7443,35.5353L17.7823,35.5353C17.8213,35.5353 17.8603,35.5353 17.9373,35.5743L18.3253,35.5743C18.3643,35.5743 18.4023,35.5743 18.4803,35.5353L18.5193,35.5353C18.5573,35.5353 18.6353,35.4963 18.6743,35.4963C18.7123,35.4963 18.7903,35.4583 18.8293,35.4193C18.8673,35.3803 18.9453,35.3803 18.9843,35.3423C19.0223,35.3033 19.0613,35.3033 19.1003,35.2643L19.1383,35.2643C19.1773,35.2253 19.2163,35.1873 19.2553,35.1873L19.2933,35.1873C19.3323,35.1483 19.3713,35.1093 19.4483,35.0713L27.1583,27.3673C27.8943,26.6323 27.8943,25.4323 27.1583,24.6583C26.4223,23.9223 25.2213,23.9223 24.4463,24.6583L20.0303,29.1093L20.0303,19.7033L34.3643,19.7033C35.4103,19.7033 36.2633,18.8513 36.2633,17.8063C36.2633,7.9743 28.1273,0.0003 18.1313,0.0003ZM3.9133,15.8713C4.8813,9.0963 10.8863,3.8323 18.1313,3.8323C25.3763,3.8323 31.3423,9.0963 32.3113,15.8713L3.9133,15.8713Z"
-        android:fillType="nonZero">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="2.9809632"
-            android:startX="25.805717"
-            android:endY="31.687763"
-            android:endX="8.569217"
-            android:type="linear">
-          <item android:offset="0" android:color="#CCFFF44F"/>
-          <item android:offset="0.75" android:color="#00FFF44F"/>
-          <item android:offset="1" android:color="#00FFF44F"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M20.0303,3.9483C26.3833,4.8003 31.4203,9.6773 32.3113,15.8713L23.8653,15.8713C21.7733,15.8713 20.0683,17.5743 20.0683,19.6643L34.3643,19.6643C35.4103,19.6643 36.2633,18.8133 36.2633,17.7673C36.2633,10.9933 31.4593,7.6643 27.3913,5.7673C23.6333,4.0253 20.0303,3.9483 20.0303,3.9483Z">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="20.534323"
-            android:startX="22.366518"
-            android:endY="7.772023"
-            android:endX="30.234228"
-            android:type="linear">
-          <item android:offset="0" android:color="#FF3A8EE6"/>
-          <item android:offset="0.24" android:color="#FF5C79F0"/>
-          <item android:offset="0.63" android:color="#FF9059FF"/>
-          <item android:offset="1" android:color="#FFC139E6"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M32.2333,15.4453C33.5123,16.4903 34.8293,17.4963 36.0693,18.5803C36.1853,18.3483 36.2633,18.0773 36.2633,17.7673C36.2633,10.9933 31.4593,7.6643 27.3913,5.7673C23.6333,4.0253 20.0303,3.9483 20.0303,3.9483C26.2283,4.7613 31.1873,9.4843 32.2333,15.4453Z">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="8.195093"
-            android:startX="30.235817"
-            android:endY="12.836453"
-            android:endX="26.934916"
-            android:type="linear">
-          <item android:offset="0" android:color="#7E6E008B"/>
-          <item android:offset="0.5" android:color="#00C846CB"/>
-          <item android:offset="1" android:color="#00C846CB"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M32.0013,15.8713L23.8653,15.8713C21.7733,15.8713 20.0683,17.5743 20.0683,19.6643L34.3643,19.6643C34.9453,19.6643 35.4883,19.3933 35.8373,18.9673C34.5583,17.9223 33.2793,16.9163 32.0013,15.8713Z">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="18.076923"
-            android:startX="31.69962"
-            android:endY="17.594997"
-            android:endX="23.366179"
-            android:type="linear">
-          <item android:offset="0" android:color="#006A2BEA"/>
-          <item android:offset="0.14" android:color="#006A2BEA"/>
-          <item android:offset="0.3" android:color="#15662CE6"/>
-          <item android:offset="0.47" android:color="#2C592FDB"/>
-          <item android:offset="0.64" android:color="#424534C9"/>
-          <item android:offset="0.82" android:color="#59283BAF"/>
-          <item android:offset="0.99" android:color="#7003448D"/>
-          <item android:offset="1" android:color="#7200458B"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>

android/app/src/main/res/layout/activity_main.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<im.delight.android.webview.AdvancedWebView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/webView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity" />

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#220033</color>
-</resources>

android/app/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Send</string>
-</resources>

android/app/src/main/res/values/styles.xml

@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

android/build.gradle

@@ -1,27 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    ext.kotlin_version = '1.3.21'
-    ext.android_components_version = '0.26.0'
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        maven { url "https://maven.mozilla.org/maven2" }
-        jcenter()
-        maven { url "https://jitpack.io" }
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

android/gradle.properties

@@ -1,13 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Tue Feb 19 08:34:25 EST 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

android/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

android/pages/.eslintrc.yaml

@@ -1,6 +0,0 @@
-env:
-  browser: true
-
-parserOptions:
-  sourceType: module
-

android/pages/error.js

@@ -1,12 +0,0 @@
-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>
-  `;
-}

android/pages/home.js

@@ -1,69 +0,0 @@
-const html = require('choo/html');
-const { list } = require('../../app/utils');
-const archiveTile = require('../../app/ui/archiveTile');
-const modal = require('../../app/ui/modal');
-const intro = require('../../app/ui/intro');
-const assets = require('../../common/assets');
-
-module.exports = function(state, emit) {
-  function onchange(event) {
-    event.preventDefault();
-    const newFiles = Array.from(event.target.files);
-
-    emit('addFiles', { files: newFiles });
-  }
-
-  function onclick() {
-    document.getElementById('file-upload').click();
-  }
-
-  const archives = state.storage.files
-    .filter(archive => !archive.expired)
-    .map(archive => archiveTile(state, emit, archive))
-    .reverse();
-
-  let content = '';
-  let button = html`
-    <div
-      class="bg-blue-50 rounded-full m-4 flex items-center justify-center shadow-lg"
-      style="width: 56px; height: 56px"
-      onclick="${onclick}"
-    >
-      <img src="${assets.get('add.svg')}" />
-    </div>
-  `;
-  if (state.uploading) {
-    content = archiveTile.uploading(state, emit);
-    button = '';
-  } else if (state.archive.numFiles > 0) {
-    content = archiveTile.wip(state, emit);
-    button = '';
-  } else {
-    content =
-      archives.length < 1
-        ? intro(state)
-        : list(archives, 'h-full overflow-y-auto w-full', 'mb-3 w-full');
-  }
-
-  return html`
-    <main class="main">
-      ${state.modal && modal(state, emit)}
-      <section
-        class="h-full w-full p-6 z-10 overflow-hidden md:flex md:flex-row md:rounded-lg md:shadow-big"
-      >
-        ${content}
-      </section>
-      <div class="fixed right-0 bottom-0 z-20">
-        ${button}
-        <input
-          id="file-upload"
-          class="hidden"
-          type="file"
-          multiple
-          onchange="${onchange}"
-          onclick="${e => e.stopPropagation()}"
-        />
-      </div>
-    </main>
-  `;
-};

android/pages/preferences.js

@@ -1,34 +0,0 @@
-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>
-  `;
-}

android/pages/share.js

@@ -1,51 +0,0 @@
-const html = require('choo/html');
-
-export default function uploadComplete(state, emit) {
-  const file = state.storage.files[state.storage.files.length - 1];
-  function onclick(e) {
-    e.preventDefault();
-    input.select();
-    document.execCommand('copy');
-    input.selectionEnd = input.selectionStart;
-    copyText.textContent = 'Copied!';
-    setTimeout(function() {
-      copyText.textContent = 'Copy link';
-    }, 2000);
-  }
-
-  function uploadFile(event) {
-    event.preventDefault();
-    const target = event.target;
-    const file = target.files[0];
-    if (file.size === 0) {
-      return;
-    }
-
-    emit('pushState', '/upload');
-    emit('addFiles', { files: [file] });
-    emit('upload', {});
-  }
-
-  const input = html`
-    <input id="url" value="${file.url}" readonly="true" />
-  `;
-  const copyText = html`
-    <span>Copy link</span>
-  `;
-  return html`<body>
-  <div id="white">
-    <div class="card">
-      <div>The card contents will be here.</div>
-      <div>Expires after: <span class="expires-after">exp</span></div>
-      ${input}
-      <div id="copy-link" onclick=${onclick}>
-        <img id="copy-image" src=${state.getAsset('copy-link.png')} />
-        ${copyText}
-      </div>
-      <label id="label" for="input">
-        <img src=${state.getAsset('cloud-upload.png')} />
-      </label>
-      <input id="input" name="input" type="file" onchange=${uploadFile} />
-  </div>
-</body>`;
-}

android/pages/upload.js

@@ -1,26 +0,0 @@
-const html = require('choo/html');
-
-export default function progressBar(state, emit) {
-  let percent = 0;
-  if (state.transfer && state.transfer.progress) {
-    percent = Math.floor(state.transfer.progressRatio * 100);
-  }
-  function onclick(e) {
-    e.preventDefault();
-    if (state.uploading) {
-      emit('cancel');
-    }
-    emit('pushState', '/');
-  }
-  return html`
-    <body>
-      <div id="white">
-        <div class="card">
-          <div>${percent}%</div>
-          <span class="progress" style="width: ${percent}%">.</span>
-          <div class="cancel" onclick="${onclick}">CANCEL</div>
-        </div>
-      </div>
-    </body>
-  `;
-}

android/settings.gradle

@@ -1 +0,0 @@
-include ':app'

android/stores/intents.js

@@ -1,20 +0,0 @@
-/* eslint-disable no-console */
-
-export default function intentHandler(state, emitter) {
-  window.addEventListener(
-    'message',
-    event => {
-      if (typeof event.data !== 'string' || !event.data.startsWith('data:')) {
-        return;
-      }
-      fetch(event.data)
-        .then(res => res.blob())
-        .then(blob => {
-          emitter.emit('addFiles', { files: [blob] });
-          emitter.emit('upload', {});
-        })
-        .catch(e => console.error('ERROR ' + e + ' ' + e.stack));
-    },
-    false
-  );
-}

android/stores/state.js

@@ -1,41 +0,0 @@
-/* eslint-disable no-console */
-
-import User from '../user';
-import storage from '../../app/storage';
-
-export default function initialState(state, emitter) {
-  const files = [];
-
-  Object.assign(state, {
-    prefix: '/android_asset',
-    user: new User(storage),
-    getAsset(name) {
-      return `${state.prefix}/${name}`;
-    },
-    sentry: {
-      captureException: e => {
-        console.error('ERROR ' + e + ' ' + e.stack);
-      }
-    },
-    storage: {
-      files,
-      remove: function(fileId) {
-        console.log('REMOVE FILEID', fileId);
-      },
-      writeFile: function(file) {
-        console.log('WRITEFILE', file);
-      },
-      addFile: function(file) {
-        console.log('addfile' + JSON.stringify(file));
-        files.push(file);
-        emitter.emit('pushState', `/share/${file.id}`);
-      },
-      totalUploads: 0
-    },
-    transfer: null,
-    uploading: false,
-    settingPassword: false,
-    passwordSetError: null,
-    route: '/'
-  });
-}

android/user.js

@@ -1,30 +0,0 @@
-/* global Android */
-import User from '../app/user';
-import { deriveFileListKey } from '../app/fxa';
-
-export default class AndroidUser extends User {
-  constructor(storage, limits) {
-    super(storage, limits);
-  }
-
-  async login() {
-    Android.beginOAuthFlow();
-  }
-
-  startAuthFlow() {
-    return Promise.resolve();
-  }
-
-  async finishLogin(accountInfo) {
-    const jwks = JSON.parse(accountInfo.keys);
-    const ikm = jwks['https://identity.mozilla.com/apps/send'].k;
-    const profile = {
-      displayName: accountInfo.displayName,
-      email: accountInfo.email,
-      avatar: accountInfo.avatar,
-      access_token: accountInfo.accessToken
-    };
-    profile.fileListKey = await deriveFileListKey(ikm);
-    this.info = profile;
-  }
-}

app/api.js

@@ -1,432 +0,0 @@
-import { arrayToB64, b64ToArray, delay } from './utils';
-import { ECE_RECORD_SIZE } from './ece';
-
-let fileProtocolWssUrl = null;
-try {
-  fileProtocolWssUrl = localStorage.getItem('wssURL');
-} catch (e) {
-  // NOOP
-}
-if (!fileProtocolWssUrl) {
-  fileProtocolWssUrl = 'wss://send.firefox.com/api/ws';
-}
-
-export class ConnectionError extends Error {
-  constructor(cancelled, duration, size) {
-    super(cancelled ? '0' : 'connection closed');
-    this.cancelled = cancelled;
-    this.duration = duration;
-    this.size = size;
-  }
-}
-
-export function setFileProtocolWssUrl(url) {
-  localStorage && localStorage.setItem('wssURL', url);
-  fileProtocolWssUrl = url;
-}
-
-export function getFileProtocolWssUrl() {
-  return fileProtocolWssUrl;
-}
-
-let apiUrlPrefix = '';
-export function getApiUrl(path) {
-  return apiUrlPrefix + path;
-}
-
-export function setApiUrlPrefix(prefix) {
-  apiUrlPrefix = prefix;
-}
-
-function post(obj, bearerToken) {
-  const h = {
-    'Content-Type': 'application/json'
-  };
-  if (bearerToken) {
-    h['Authorization'] = `Bearer ${bearerToken}`;
-  }
-  return {
-    method: 'POST',
-    headers: new Headers(h),
-    body: JSON.stringify(obj)
-  };
-}
-
-export function parseNonce(header) {
-  header = header || '';
-  return header.split(' ')[1];
-}
-
-async function fetchWithAuth(url, params, keychain) {
-  const result = {};
-  params = params || {};
-  const h = await keychain.authHeader();
-  params.headers = new Headers({
-    Authorization: h,
-    'Content-Type': 'application/json'
-  });
-  const response = await fetch(url, params);
-  result.response = response;
-  result.ok = response.ok;
-  const nonce = parseNonce(response.headers.get('WWW-Authenticate'));
-  result.shouldRetry = response.status === 401 && nonce !== keychain.nonce;
-  keychain.nonce = nonce;
-  return result;
-}
-
-async function fetchWithAuthAndRetry(url, params, keychain) {
-  const result = await fetchWithAuth(url, params, keychain);
-  if (result.shouldRetry) {
-    return fetchWithAuth(url, params, keychain);
-  }
-  return result;
-}
-
-export async function del(id, owner_token) {
-  const response = await fetch(
-    getApiUrl(`/api/delete/${id}`),
-    post({ owner_token })
-  );
-  return response.ok;
-}
-
-export async function setParams(id, owner_token, bearerToken, params) {
-  const response = await fetch(
-    getApiUrl(`/api/params/${id}`),
-    post(
-      {
-        owner_token,
-        dlimit: params.dlimit
-      },
-      bearerToken
-    )
-  );
-  return response.ok;
-}
-
-export async function fileInfo(id, owner_token) {
-  const response = await fetch(
-    getApiUrl(`/api/info/${id}`),
-    post({ owner_token })
-  );
-
-  if (response.ok) {
-    const obj = await response.json();
-    return obj;
-  }
-
-  throw new Error(response.status);
-}
-
-export async function metadata(id, keychain) {
-  const result = await fetchWithAuthAndRetry(
-    getApiUrl(`/api/metadata/${id}`),
-    { method: 'GET' },
-    keychain
-  );
-  if (result.ok) {
-    const data = await result.response.json();
-    const meta = await keychain.decryptMetadata(b64ToArray(data.metadata));
-    return {
-      size: meta.size,
-      ttl: data.ttl,
-      iv: meta.iv,
-      name: meta.name,
-      type: meta.type,
-      manifest: meta.manifest
-    };
-  }
-  throw new Error(result.response.status);
-}
-
-export async function setPassword(id, owner_token, keychain) {
-  const auth = await keychain.authKeyB64();
-  const response = await fetch(
-    getApiUrl(`/api/password/${id}`),
-    post({ owner_token, auth })
-  );
-  return response.ok;
-}
-
-function asyncInitWebSocket(server) {
-  return new Promise((resolve, reject) => {
-    try {
-      const ws = new WebSocket(server);
-      ws.addEventListener('open', () => resolve(ws), { once: true });
-    } catch (e) {
-      reject(new ConnectionError(false));
-    }
-  });
-}
-
-function listenForResponse(ws, canceller) {
-  return new Promise((resolve, reject) => {
-    function handleClose(event) {
-      // a 'close' event before a 'message' event means the request failed
-      ws.removeEventListener('message', handleMessage);
-      reject(new ConnectionError(canceller.cancelled));
-    }
-    function handleMessage(msg) {
-      ws.removeEventListener('close', handleClose);
-      try {
-        const response = JSON.parse(msg.data);
-        if (response.error) {
-          throw new Error(response.error);
-        } else {
-          resolve(response);
-        }
-      } catch (e) {
-        reject(e);
-      }
-    }
-    ws.addEventListener('message', handleMessage, { once: true });
-    ws.addEventListener('close', handleClose, { once: true });
-  });
-}
-
-async function upload(
-  stream,
-  metadata,
-  verifierB64,
-  timeLimit,
-  dlimit,
-  bearerToken,
-  onprogress,
-  canceller
-) {
-  let size = 0;
-  const start = Date.now();
-  const host = window.location.hostname;
-  const port = window.location.port;
-  const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-  const endpoint =
-    window.location.protocol === 'file:'
-      ? fileProtocolWssUrl
-      : `${protocol}//${host}${port ? ':' : ''}${port}/api/ws`;
-
-  const ws = await asyncInitWebSocket(endpoint);
-
-  try {
-    const metadataHeader = arrayToB64(new Uint8Array(metadata));
-    const fileMeta = {
-      fileMetadata: metadataHeader,
-      authorization: `send-v1 ${verifierB64}`,
-      bearer: bearerToken,
-      timeLimit,
-      dlimit
-    };
-    const uploadInfoResponse = listenForResponse(ws, canceller);
-    ws.send(JSON.stringify(fileMeta));
-    const uploadInfo = await uploadInfoResponse;
-
-    const completedResponse = listenForResponse(ws, canceller);
-
-    const reader = stream.getReader();
-    let state = await reader.read();
-    while (!state.done) {
-      if (canceller.cancelled) {
-        ws.close();
-      }
-      if (ws.readyState !== WebSocket.OPEN) {
-        break;
-      }
-      const buf = state.value;
-      ws.send(buf);
-      onprogress(size);
-      size += buf.length;
-      state = await reader.read();
-      while (
-        ws.bufferedAmount > ECE_RECORD_SIZE * 2 &&
-        ws.readyState === WebSocket.OPEN &&
-        !canceller.cancelled
-      ) {
-        await delay();
-      }
-    }
-    if (ws.readyState === WebSocket.OPEN) {
-      ws.send(new Uint8Array([0])); //EOF
-    }
-
-    await completedResponse;
-    uploadInfo.duration = Date.now() - start;
-    return uploadInfo;
-  } catch (e) {
-    e.size = size;
-    e.duration = Date.now() - start;
-    throw e;
-  } finally {
-    if (![WebSocket.CLOSED, WebSocket.CLOSING].includes(ws.readyState)) {
-      ws.close();
-    }
-  }
-}
-
-export function uploadWs(
-  encrypted,
-  metadata,
-  verifierB64,
-  timeLimit,
-  dlimit,
-  bearerToken,
-  onprogress
-) {
-  const canceller = { cancelled: false };
-
-  return {
-    cancel: function() {
-      canceller.cancelled = true;
-    },
-
-    result: upload(
-      encrypted,
-      metadata,
-      verifierB64,
-      timeLimit,
-      dlimit,
-      bearerToken,
-      onprogress,
-      canceller
-    )
-  };
-}
-
-////////////////////////
-
-async function downloadS(id, keychain, signal) {
-  const auth = await keychain.authHeader();
-
-  const response = await fetch(getApiUrl(`/api/download/${id}`), {
-    signal: signal,
-    method: 'GET',
-    headers: { Authorization: auth }
-  });
-
-  const authHeader = response.headers.get('WWW-Authenticate');
-  if (authHeader) {
-    keychain.nonce = parseNonce(authHeader);
-  }
-
-  if (response.status !== 200) {
-    throw new Error(response.status);
-  }
-
-  return response.body;
-}
-
-async function tryDownloadStream(id, keychain, signal, tries = 2) {
-  try {
-    const result = await downloadS(id, keychain, signal);
-    return result;
-  } catch (e) {
-    if (e.message === '401' && --tries > 0) {
-      return tryDownloadStream(id, keychain, signal, tries);
-    }
-    if (e.name === 'AbortError') {
-      throw new Error('0');
-    }
-    throw e;
-  }
-}
-
-export function downloadStream(id, keychain) {
-  const controller = new AbortController();
-  function cancel() {
-    controller.abort();
-  }
-  return {
-    cancel,
-    result: tryDownloadStream(id, keychain, controller.signal)
-  };
-}
-
-//////////////////
-
-async function download(id, keychain, onprogress, canceller) {
-  const auth = await keychain.authHeader();
-  const xhr = new XMLHttpRequest();
-  canceller.oncancel = function() {
-    xhr.abort();
-  };
-  return new Promise(function(resolve, reject) {
-    xhr.addEventListener('loadend', function() {
-      canceller.oncancel = function() {};
-      const authHeader = xhr.getResponseHeader('WWW-Authenticate');
-      if (authHeader) {
-        keychain.nonce = parseNonce(authHeader);
-      }
-      if (xhr.status !== 200) {
-        return reject(new Error(xhr.status));
-      }
-
-      const blob = new Blob([xhr.response]);
-      resolve(blob);
-    });
-
-    xhr.addEventListener('progress', function(event) {
-      if (event.target.status === 200) {
-        onprogress(event.loaded);
-      }
-    });
-    xhr.open('get', getApiUrl(`/api/download/blob/${id}`));
-    xhr.setRequestHeader('Authorization', auth);
-    xhr.responseType = 'blob';
-    xhr.send();
-    onprogress(0);
-  });
-}
-
-async function tryDownload(id, keychain, onprogress, canceller, tries = 2) {
-  try {
-    const result = await download(id, keychain, onprogress, canceller);
-    return result;
-  } catch (e) {
-    if (e.message === '401' && --tries > 0) {
-      return tryDownload(id, keychain, onprogress, canceller, tries);
-    }
-    throw e;
-  }
-}
-
-export function downloadFile(id, keychain, onprogress) {
-  const canceller = {
-    oncancel: function() {} // download() sets this
-  };
-  function cancel() {
-    canceller.oncancel();
-  }
-  return {
-    cancel,
-    result: tryDownload(id, keychain, onprogress, canceller)
-  };
-}
-
-export async function getFileList(bearerToken, kid) {
-  const headers = new Headers({ Authorization: `Bearer ${bearerToken}` });
-  const response = await fetch(getApiUrl(`/api/filelist/${kid}`), { headers });
-  if (response.ok) {
-    const encrypted = await response.blob();
-    return encrypted;
-  }
-  throw new Error(response.status);
-}
-
-export async function setFileList(bearerToken, kid, data) {
-  const headers = new Headers({ Authorization: `Bearer ${bearerToken}` });
-  const response = await fetch(getApiUrl(`/api/filelist/${kid}`), {
-    headers,
-    method: 'POST',
-    body: data
-  });
-  return response.ok;
-}
-
-export async function getConstants() {
-  const response = await fetch(getApiUrl('/config'));
-
-  if (response.ok) {
-    const obj = await response.json();
-    return obj;
-  }
-
-  throw new Error(response.status);
-}

app/archive.js

@@ -1,84 +0,0 @@
-import { blobStream, concatStream } from './streams';
-
-function isDupe(newFile, array) {
-  for (const file of array) {
-    if (
-      newFile.name === file.name &&
-      newFile.size === file.size &&
-      newFile.lastModified === file.lastModified
-    ) {
-      return true;
-    }
-  }
-  return false;
-}
-
-export default class Archive {
-  constructor(files = [], defaultTimeLimit = 86400, defaultDownloadLimit = 1) {
-    this.files = Array.from(files);
-    this.defaultTimeLimit = defaultTimeLimit;
-    this.defaultDownloadLimit = defaultDownloadLimit;
-    this.timeLimit = defaultTimeLimit;
-    this.dlimit = defaultDownloadLimit;
-    this.password = null;
-  }
-
-  get name() {
-    return this.files.length > 1 ? 'Send-Archive.zip' : this.files[0].name;
-  }
-
-  get type() {
-    return this.files.length > 1 ? 'send-archive' : this.files[0].type;
-  }
-
-  get size() {
-    return this.files.reduce((total, file) => total + file.size, 0);
-  }
-
-  get numFiles() {
-    return this.files.length;
-  }
-
-  get manifest() {
-    return {
-      files: this.files.map(file => ({
-        name: file.name,
-        size: file.size,
-        type: file.type
-      }))
-    };
-  }
-
-  get stream() {
-    return concatStream(this.files.map(file => blobStream(file)));
-  }
-
-  addFiles(files, maxSize, maxFiles) {
-    if (this.files.length + files.length > maxFiles) {
-      throw new Error('tooManyFiles');
-    }
-    const newFiles = files.filter(
-      file => file.size > 0 && !isDupe(file, this.files)
-    );
-    const newSize = newFiles.reduce((total, file) => total + file.size, 0);
-    if (this.size + newSize > maxSize) {
-      throw new Error('fileTooBig');
-    }
-    this.files = this.files.concat(newFiles);
-    return true;
-  }
-
-  remove(file) {
-    const index = this.files.indexOf(file);
-    if (index > -1) {
-      this.files.splice(index, 1);
-    }
-  }
-
-  clear() {
-    this.files = [];
-    this.dlimit = this.defaultDownloadLimit;
-    this.timeLimit = this.defaultTimeLimit;
-    this.password = null;
-  }
-}

app/capabilities.js

@@ -1,116 +0,0 @@
-/* global AUTH_CONFIG */
-import { browserName, locale } from './utils';
-
-async function checkCrypto() {
-  try {
-    const key = await crypto.subtle.generateKey(
-      {
-        name: 'AES-GCM',
-        length: 128
-      },
-      true,
-      ['encrypt', 'decrypt']
-    );
-    await crypto.subtle.exportKey('raw', key);
-    await crypto.subtle.encrypt(
-      {
-        name: 'AES-GCM',
-        iv: crypto.getRandomValues(new Uint8Array(12)),
-        tagLength: 128
-      },
-      key,
-      new ArrayBuffer(8)
-    );
-    await crypto.subtle.importKey(
-      'raw',
-      crypto.getRandomValues(new Uint8Array(16)),
-      'PBKDF2',
-      false,
-      ['deriveKey']
-    );
-    await crypto.subtle.importKey(
-      'raw',
-      crypto.getRandomValues(new Uint8Array(16)),
-      'HKDF',
-      false,
-      ['deriveKey']
-    );
-    await crypto.subtle.generateKey(
-      {
-        name: 'ECDH',
-        namedCurve: 'P-256'
-      },
-      true,
-      ['deriveBits']
-    );
-    return true;
-  } catch (err) {
-    try {
-      window.asmCrypto = await import('asmcrypto.js');
-      await import('@dannycoates/webcrypto-liner/build/shim');
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-}
-
-function checkStreams() {
-  try {
-    new ReadableStream({
-      pull() {}
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-async function polyfillStreams() {
-  try {
-    await import('@mattiasbuelens/web-streams-polyfill');
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-export default async function getCapabilities() {
-  const browser = browserName();
-  const isMobile = /mobi|android/i.test(navigator.userAgent);
-  const serviceWorker = 'serviceWorker' in navigator && browser !== 'edge';
-  let crypto = await checkCrypto();
-  const nativeStreams = checkStreams();
-  let polyStreams = false;
-  if (!nativeStreams) {
-    polyStreams = await polyfillStreams();
-  }
-  let account = typeof AUTH_CONFIG !== 'undefined';
-  try {
-    account = account && !!localStorage;
-  } catch (e) {
-    account = false;
-  }
-  const share =
-    isMobile &&
-    typeof navigator.share === 'function' &&
-    locale().startsWith('en'); // en until strings merge
-
-  const standalone =
-    window.matchMedia('(display-mode: standalone)').matches ||
-    navigator.standalone;
-
-  const mobileFirefox = browser === 'firefox' && isMobile;
-
-  return {
-    account,
-    crypto,
-    serviceWorker,
-    streamUpload: nativeStreams || polyStreams,
-    streamDownload:
-      nativeStreams && serviceWorker && browser !== 'safari' && !mobileFirefox,
-    multifile: nativeStreams || polyStreams,
-    share,
-    standalone
-  };
-}

app/controller.js

@@ -1,309 +0,0 @@
-import FileReceiver from './fileReceiver';
-import FileSender from './fileSender';
-import copyDialog from './ui/copyDialog';
-import faviconProgressbar from './ui/faviconProgressbar';
-import okDialog from './ui/okDialog';
-import shareDialog from './ui/shareDialog';
-import signupDialog from './ui/signupDialog';
-import surveyDialog from './ui/surveyDialog';
-import { bytes, locale } from './utils';
-import { copyToClipboard, delay, openLinksInNewTab, percent } from './utils';
-
-export default function(state, emitter) {
-  let lastRender = 0;
-  let updateTitle = false;
-
-  function render() {
-    emitter.emit('render');
-  }
-
-  async function checkFiles() {
-    const changes = await state.user.syncFileList();
-    const rerender = changes.incoming || changes.downloadCount;
-    if (rerender) {
-      render();
-    }
-  }
-
-  function updateProgress() {
-    if (updateTitle) {
-      emitter.emit('DOMTitleChange', percent(state.transfer.progressRatio));
-    }
-    faviconProgressbar.updateFavicon(state.transfer.progressRatio);
-    render();
-  }
-
-  emitter.on('DOMContentLoaded', () => {
-    document.addEventListener('blur', () => (updateTitle = true));
-    document.addEventListener('focus', () => {
-      updateTitle = false;
-      emitter.emit('DOMTitleChange', 'Send');
-      faviconProgressbar.updateFavicon(0);
-    });
-    checkFiles();
-  });
-
-  emitter.on('render', () => {
-    lastRender = Date.now();
-  });
-
-  emitter.on('login', email => {
-    state.user.login(email);
-  });
-
-  emitter.on('logout', async () => {
-    await state.user.logout();
-    emitter.emit('pushState', '/');
-  });
-
-  emitter.on('removeUpload', file => {
-    state.archive.remove(file);
-    if (state.archive.numFiles === 0) {
-      state.archive.clear();
-    }
-    render();
-  });
-
-  emitter.on('delete', async ownedFile => {
-    try {
-      state.storage.remove(ownedFile.id);
-      await ownedFile.del();
-    } catch (e) {
-      state.sentry.captureException(e);
-    }
-    render();
-  });
-
-  emitter.on('cancel', () => {
-    state.transfer.cancel();
-    faviconProgressbar.updateFavicon(0);
-  });
-
-  emitter.on('addFiles', async ({ files }) => {
-    if (files.length < 1) {
-      return;
-    }
-    const maxSize = state.user.maxSize;
-    try {
-      state.archive.addFiles(
-        files,
-        maxSize,
-        state.LIMITS.MAX_FILES_PER_ARCHIVE
-      );
-    } catch (e) {
-      state.modal = okDialog(
-        state.translate(e.message, {
-          size: bytes(maxSize),
-          count: state.LIMITS.MAX_FILES_PER_ARCHIVE
-        })
-      );
-    }
-    render();
-  });
-
-  emitter.on('signup-cta', source => {
-    const query = state.query;
-    state.user.startAuthFlow(source, {
-      campaign: query.utm_campaign,
-      content: query.utm_content,
-      medium: query.utm_medium,
-      source: query.utm_source,
-      term: query.utm_term
-    });
-    state.modal = signupDialog();
-    render();
-  });
-
-  emitter.on('authenticate', async (code, oauthState) => {
-    try {
-      await state.user.finishLogin(code, oauthState);
-      await state.user.syncFileList();
-      emitter.emit('replaceState', '/');
-    } catch (e) {
-      emitter.emit('replaceState', '/error');
-      setTimeout(render);
-    }
-  });
-
-  emitter.on('upload', async () => {
-    if (state.storage.files.length >= state.LIMITS.MAX_ARCHIVES_PER_USER) {
-      state.modal = okDialog(
-        state.translate('tooManyArchives', {
-          count: state.LIMITS.MAX_ARCHIVES_PER_USER
-        })
-      );
-      return render();
-    }
-    const archive = state.archive;
-    const sender = new FileSender();
-
-    sender.on('progress', updateProgress);
-    sender.on('encrypting', render);
-    sender.on('complete', render);
-    state.transfer = sender;
-    state.uploading = true;
-    render();
-
-    const links = openLinksInNewTab();
-    await delay(200);
-    try {
-      const ownedFile = await sender.upload(archive, state.user.bearerToken);
-      state.storage.totalUploads += 1;
-      faviconProgressbar.updateFavicon(0);
-
-      state.storage.addFile(ownedFile);
-      // TODO integrate password into /upload request
-      if (archive.password) {
-        emitter.emit('password', {
-          password: archive.password,
-          file: ownedFile
-        });
-      }
-      state.modal = state.capabilities.share
-        ? shareDialog(ownedFile.name, ownedFile.url)
-        : copyDialog(ownedFile.name, ownedFile.url);
-    } catch (err) {
-      if (err.message === '0') {
-        //cancelled. do nothing
-        render();
-      } else if (err.message === '401') {
-        const refreshed = await state.user.refresh();
-        if (refreshed) {
-          return emitter.emit('upload');
-        }
-        emitter.emit('pushState', '/error');
-      } else {
-        // eslint-disable-next-line no-console
-        console.error(err);
-        state.sentry.withScope(scope => {
-          scope.setExtra('duration', err.duration);
-          scope.setExtra('size', err.size);
-          state.sentry.captureException(err);
-        });
-        emitter.emit('pushState', '/error');
-      }
-    } finally {
-      openLinksInNewTab(links, false);
-      archive.clear();
-      state.uploading = false;
-      state.transfer = null;
-      await state.user.syncFileList();
-      render();
-    }
-  });
-
-  emitter.on('password', async ({ password, file }) => {
-    try {
-      state.settingPassword = true;
-      render();
-      await file.setPassword(password);
-      state.storage.writeFile(file);
-      await delay(1000);
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error(err);
-      state.passwordSetError = err;
-    } finally {
-      state.settingPassword = false;
-    }
-    render();
-  });
-
-  emitter.on('getMetadata', async () => {
-    const file = state.fileInfo;
-
-    const receiver = new FileReceiver(file);
-    try {
-      await receiver.getMetadata();
-      state.transfer = receiver;
-    } catch (e) {
-      if (e.message === '401' || e.message === '404') {
-        file.password = null;
-        if (!file.requiresPassword) {
-          return emitter.emit('pushState', '/404');
-        }
-      } else {
-        console.error(e);
-        return emitter.emit('pushState', '/error');
-      }
-    }
-
-    render();
-  });
-
-  emitter.on('download', async () => {
-    state.transfer.on('progress', updateProgress);
-    state.transfer.on('decrypting', render);
-    state.transfer.on('complete', render);
-    const links = openLinksInNewTab();
-    try {
-      const dl = state.transfer.download({
-        stream: state.capabilities.streamDownload
-      });
-      render();
-      await dl;
-      state.storage.totalDownloads += 1;
-      faviconProgressbar.updateFavicon(0);
-    } catch (err) {
-      if (err.message === '0') {
-        // download cancelled
-        state.transfer.reset();
-        render();
-      } else {
-        // eslint-disable-next-line no-console
-        state.transfer = null;
-        const location = err.message === '404' ? '/404' : '/error';
-        if (location === '/error') {
-          state.sentry.withScope(scope => {
-            scope.setExtra('duration', err.duration);
-            scope.setExtra('size', err.size);
-            scope.setExtra('progress', err.progress);
-            state.sentry.captureException(err);
-          });
-        }
-        emitter.emit('pushState', location);
-      }
-    } finally {
-      openLinksInNewTab(links, false);
-    }
-  });
-
-  emitter.on('copy', ({ url }) => {
-    copyToClipboard(url);
-  });
-
-  emitter.on('closeModal', () => {
-    if (
-      state.PREFS.surveyUrl &&
-      ['copy', 'share'].includes(state.modal.type) &&
-      locale().startsWith('en') &&
-      (state.storage.totalUploads > 1 || state.storage.totalDownloads > 0) &&
-      !state.user.surveyed
-    ) {
-      state.user.surveyed = true;
-      state.modal = surveyDialog();
-    } else {
-      state.modal = null;
-    }
-    render();
-  });
-
-  setInterval(() => {
-    // poll for updates of the upload list
-    if (!state.modal && state.route === '/') {
-      checkFiles();
-    }
-  }, 2 * 60 * 1000);
-
-  setInterval(() => {
-    // poll for rerendering the file list countdown timers
-    if (
-      !state.modal &&
-      state.route === '/' &&
-      state.storage.files.length > 0 &&
-      Date.now() - lastRender > 30000
-    ) {
-      render();
-    }
-  }, 60000);
-}

app/dragManager.js

@@ -6,16 +6,18 @@ export default function(state, emitter) {
       }
     });
     document.body.addEventListener('drop', event => {
-      if (
+      if (state.route === '/' && !state.transfer) {
-        state.route === '/' &&
-        !state.uploading &&
-        event.dataTransfer &&
-        event.dataTransfer.files
-      ) {
         event.preventDefault();
-        emitter.emit('addFiles', {
+        document.querySelector('.upload-window').classList.remove('ondrag');
-          files: Array.from(event.dataTransfer.files)
+        const target = event.dataTransfer;
-        });
+        if (target.files.length === 0) {
+          return;
+        }
+        if (target.files.length > 1 || target.files[0].size === 0) {
+          return alert(state.translate('uploadPageMultipleFilesAlert'));
+        }
+        const file = target.files[0];
+        emitter.emit('upload', { file, type: 'drop' });
       }
     });
   });

app/ece.js

@@ -1,310 +0,0 @@
-import 'buffer';
-import { transformStream } from './streams';
-
-const NONCE_LENGTH = 12;
-const TAG_LENGTH = 16;
-const KEY_LENGTH = 16;
-const MODE_ENCRYPT = 'encrypt';
-const MODE_DECRYPT = 'decrypt';
-export const ECE_RECORD_SIZE = 1024 * 64;
-
-const encoder = new TextEncoder();
-
-function generateSalt(len) {
-  const randSalt = new Uint8Array(len);
-  crypto.getRandomValues(randSalt);
-  return randSalt.buffer;
-}
-
-class ECETransformer {
-  constructor(mode, ikm, rs, salt) {
-    this.mode = mode;
-    this.prevChunk;
-    this.seq = 0;
-    this.firstchunk = true;
-    this.rs = rs;
-    this.ikm = ikm.buffer;
-    this.salt = salt;
-  }
-
-  async generateKey() {
-    const inputKey = await crypto.subtle.importKey(
-      'raw',
-      this.ikm,
-      'HKDF',
-      false,
-      ['deriveKey']
-    );
-
-    return crypto.subtle.deriveKey(
-      {
-        name: 'HKDF',
-        salt: this.salt,
-        info: encoder.encode('Content-Encoding: aes128gcm\0'),
-        hash: 'SHA-256'
-      },
-      inputKey,
-      {
-        name: 'AES-GCM',
-        length: 128
-      },
-      true, // Edge polyfill requires key to be extractable to encrypt :/
-      ['encrypt', 'decrypt']
-    );
-  }
-
-  async generateNonceBase() {
-    const inputKey = await crypto.subtle.importKey(
-      'raw',
-      this.ikm,
-      'HKDF',
-      false,
-      ['deriveKey']
-    );
-
-    const base = await crypto.subtle.exportKey(
-      'raw',
-      await crypto.subtle.deriveKey(
-        {
-          name: 'HKDF',
-          salt: this.salt,
-          info: encoder.encode('Content-Encoding: nonce\0'),
-          hash: 'SHA-256'
-        },
-        inputKey,
-        {
-          name: 'AES-GCM',
-          length: 128
-        },
-        true,
-        ['encrypt', 'decrypt']
-      )
-    );
-
-    return Buffer.from(base.slice(0, NONCE_LENGTH));
-  }
-
-  generateNonce(seq) {
-    if (seq > 0xffffffff) {
-      throw new Error('record sequence number exceeds limit');
-    }
-    const nonce = Buffer.from(this.nonceBase);
-    const m = nonce.readUIntBE(nonce.length - 4, 4);
-    const xor = (m ^ seq) >>> 0; //forces unsigned int xor
-    nonce.writeUIntBE(xor, nonce.length - 4, 4);
-
-    return nonce;
-  }
-
-  pad(data, isLast) {
-    const len = data.length;
-    if (len + TAG_LENGTH >= this.rs) {
-      throw new Error('data too large for record size');
-    }
-
-    if (isLast) {
-      const padding = Buffer.alloc(1);
-      padding.writeUInt8(2, 0);
-      return Buffer.concat([data, padding]);
-    } else {
-      const padding = Buffer.alloc(this.rs - len - TAG_LENGTH);
-      padding.fill(0);
-      padding.writeUInt8(1, 0);
-      return Buffer.concat([data, padding]);
-    }
-  }
-
-  unpad(data, isLast) {
-    for (let i = data.length - 1; i >= 0; i--) {
-      if (data[i]) {
-        if (isLast) {
-          if (data[i] !== 2) {
-            throw new Error('delimiter of final record is not 2');
-          }
-        } else {
-          if (data[i] !== 1) {
-            throw new Error('delimiter of not final record is not 1');
-          }
-        }
-        return data.slice(0, i);
-      }
-    }
-    throw new Error('no delimiter found');
-  }
-
-  createHeader() {
-    const nums = Buffer.alloc(5);
-    nums.writeUIntBE(this.rs, 0, 4);
-    nums.writeUIntBE(0, 4, 1);
-    return Buffer.concat([Buffer.from(this.salt), nums]);
-  }
-
-  readHeader(buffer) {
-    if (buffer.length < 21) {
-      throw new Error('chunk too small for reading header');
-    }
-    const header = {};
-    header.salt = buffer.buffer.slice(0, KEY_LENGTH);
-    header.rs = buffer.readUIntBE(KEY_LENGTH, 4);
-    const idlen = buffer.readUInt8(KEY_LENGTH + 4);
-    header.length = idlen + KEY_LENGTH + 5;
-    return header;
-  }
-
-  async encryptRecord(buffer, seq, isLast) {
-    const nonce = this.generateNonce(seq);
-    const encrypted = await crypto.subtle.encrypt(
-      { name: 'AES-GCM', iv: nonce },
-      this.key,
-      this.pad(buffer, isLast)
-    );
-    return Buffer.from(encrypted);
-  }
-
-  async decryptRecord(buffer, seq, isLast) {
-    const nonce = this.generateNonce(seq);
-    const data = await crypto.subtle.decrypt(
-      {
-        name: 'AES-GCM',
-        iv: nonce,
-        tagLength: 128
-      },
-      this.key,
-      buffer
-    );
-
-    return this.unpad(Buffer.from(data), isLast);
-  }
-
-  async start(controller) {
-    if (this.mode === MODE_ENCRYPT) {
-      this.key = await this.generateKey();
-      this.nonceBase = await this.generateNonceBase();
-      controller.enqueue(this.createHeader());
-    } else if (this.mode !== MODE_DECRYPT) {
-      throw new Error('mode must be either encrypt or decrypt');
-    }
-  }
-
-  async transformPrevChunk(isLast, controller) {
-    if (this.mode === MODE_ENCRYPT) {
-      controller.enqueue(
-        await this.encryptRecord(this.prevChunk, this.seq, isLast)
-      );
-      this.seq++;
-    } else {
-      if (this.seq === 0) {
-        //the first chunk during decryption contains only the header
-        const header = this.readHeader(this.prevChunk);
-        this.salt = header.salt;
-        this.rs = header.rs;
-        this.key = await this.generateKey();
-        this.nonceBase = await this.generateNonceBase();
-      } else {
-        controller.enqueue(
-          await this.decryptRecord(this.prevChunk, this.seq - 1, isLast)
-        );
-      }
-      this.seq++;
-    }
-  }
-
-  async transform(chunk, controller) {
-    if (!this.firstchunk) {
-      await this.transformPrevChunk(false, controller);
-    }
-    this.firstchunk = false;
-    this.prevChunk = Buffer.from(chunk.buffer);
-  }
-
-  async flush(controller) {
-    //console.log('ece stream ends')
-    if (this.prevChunk) {
-      await this.transformPrevChunk(true, controller);
-    }
-  }
-}
-
-class StreamSlicer {
-  constructor(rs, mode) {
-    this.mode = mode;
-    this.rs = rs;
-    this.chunkSize = mode === MODE_ENCRYPT ? rs - 17 : 21;
-    this.partialChunk = new Uint8Array(this.chunkSize); //where partial chunks are saved
-    this.offset = 0;
-  }
-
-  send(buf, controller) {
-    controller.enqueue(buf);
-    if (this.chunkSize === 21 && this.mode === MODE_DECRYPT) {
-      this.chunkSize = this.rs;
-    }
-    this.partialChunk = new Uint8Array(this.chunkSize);
-    this.offset = 0;
-  }
-
-  //reslice input into record sized chunks
-  transform(chunk, controller) {
-    //console.log('Received chunk with %d bytes.', chunk.byteLength)
-    let i = 0;
-
-    if (this.offset > 0) {
-      const len = Math.min(chunk.byteLength, this.chunkSize - this.offset);
-      this.partialChunk.set(chunk.slice(0, len), this.offset);
-      this.offset += len;
-      i += len;
-
-      if (this.offset === this.chunkSize) {
-        this.send(this.partialChunk, controller);
-      }
-    }
-
-    while (i < chunk.byteLength) {
-      const remainingBytes = chunk.byteLength - i;
-      if (remainingBytes >= this.chunkSize) {
-        const record = chunk.slice(i, i + this.chunkSize);
-        i += this.chunkSize;
-        this.send(record, controller);
-      } else {
-        const end = chunk.slice(i, i + remainingBytes);
-        i += end.byteLength;
-        this.partialChunk.set(end);
-        this.offset = end.byteLength;
-      }
-    }
-  }
-
-  flush(controller) {
-    if (this.offset > 0) {
-      controller.enqueue(this.partialChunk.slice(0, this.offset));
-    }
-  }
-}
-
-/*
-input: a ReadableStream containing data to be transformed
-key:  Uint8Array containing key of size KEY_LENGTH
-rs:   int containing record size, optional
-salt: ArrayBuffer containing salt of KEY_LENGTH length, optional
-*/
-export function encryptStream(
-  input,
-  key,
-  rs = ECE_RECORD_SIZE,
-  salt = generateSalt(KEY_LENGTH)
-) {
-  const mode = 'encrypt';
-  const inputStream = transformStream(input, new StreamSlicer(rs, mode));
-  return transformStream(inputStream, new ECETransformer(mode, key, rs, salt));
-}
-
-/*
-input: a ReadableStream containing data to be transformed
-key:  Uint8Array containing key of size KEY_LENGTH
-rs:   int containing record size, optional
-*/
-export function decryptStream(input, key, rs = ECE_RECORD_SIZE) {
-  const mode = 'decrypt';
-  const inputStream = transformStream(input, new StreamSlicer(rs, mode));
-  return transformStream(inputStream, new ECETransformer(mode, key, rs));
-}

app/experiments.js

@@ -1,19 +1,25 @@
 import hash from 'string-hash';
-import Account from './ui/account';
 
 const experiments = {
-  signin_button_color: {
+  'SyI-hI7gT9agiH-f3f0BYg': {
+    id: 'SyI-hI7gT9agiH-f3f0BYg',
+    run: function(variant, state, emitter) {
+      state.promo = variant === 1 ? 'body' : 'header';
+      emitter.emit('render');
+    },
     eligible: function() {
-      return true;
+      return (
+        !/firefox/i.test(navigator.userAgent) &&
+        document.querySelector('html').lang === 'en-US'
+      );
     },
-    variant: function() {
+    variant: function(state) {
-      return ['white-primary', 'primary', 'white-violet', 'violet'][
+      return this.luckyNumber(state) > 0.5 ? 1 : 0;
-        Math.floor(Math.random() * 4)
-      ];
     },
-    run: function(variant, state) {
+    luckyNumber: function(state) {
-      const account = state.cache(Account, 'account');
+      return luckyNumber(
-      account.buttonClass = variant;
+        `${this.id}:${state.storage.get('testpilot_ga__cid')}`
+      );
     }
   }
 };
@@ -41,12 +47,23 @@ export default function initialize(state, emitter) {
       xp.run(+state.query.v, state, emitter);
     }
   });
-  const enrolled = state.storage.enrolled;
+
-  // single experiment per session for now
+  if (!state.storage.get('testpilot_ga__cid')) {
-  const id = Object.keys(enrolled)[0];
+    // first ever visit. check again after cid is assigned.
-  if (Object.keys(experiments).includes(id)) {
+    emitter.on('DOMContentLoaded', () => {
-    experiments[id].run(enrolled[id], state, emitter);
+      checkExperiments(state, emitter);
+    });
   } else {
-    checkExperiments(state, emitter);
+    const enrolled = state.storage.enrolled.filter(([id, variant]) => {
+      const xp = experiments[id];
+      if (xp) {
+        xp.run(variant, state, emitter);
+      }
+      return !!xp;
+    });
+    // single experiment per session for now
+    if (enrolled.length === 0) {
+      checkExperiments(state, emitter);
+    }
   }
 }

app/fileManager.js

@@ -0,0 +1,249 @@
+/* global EXPIRE_SECONDS */
+import FileSender from './fileSender';
+import FileReceiver from './fileReceiver';
+import { copyToClipboard, delay, fadeOut, percent } from './utils';
+import * as metrics from './metrics';
+
+function saveFile(file) {
+  const dataView = new DataView(file.plaintext);
+  const blob = new Blob([dataView], { type: file.type });
+  const downloadUrl = URL.createObjectURL(blob);
+
+  if (window.navigator.msSaveBlob) {
+    return window.navigator.msSaveBlob(blob, file.name);
+  }
+  const a = document.createElement('a');
+  a.href = downloadUrl;
+  a.download = file.name;
+  document.body.appendChild(a);
+  a.click();
+  URL.revokeObjectURL(downloadUrl);
+}
+
+function openLinksInNewTab(links, should = true) {
+  links = links || Array.from(document.querySelectorAll('a:not([target])'));
+  if (should) {
+    links.forEach(l => {
+      l.setAttribute('target', '_blank');
+      l.setAttribute('rel', 'noopener noreferrer');
+    });
+  } else {
+    links.forEach(l => {
+      l.removeAttribute('target');
+      l.removeAttribute('rel');
+    });
+  }
+  return links;
+}
+
+function exists(id) {
+  return new Promise((resolve, reject) => {
+    const xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = () => {
+      if (xhr.readyState === XMLHttpRequest.HEADERS_RECEIVED) {
+        resolve(xhr.status === 200);
+      }
+    };
+    xhr.onerror = () => resolve(false);
+    xhr.ontimeout = () => resolve(false);
+    xhr.open('get', '/api/exists/' + id);
+    xhr.timeout = 2000;
+    xhr.send();
+  });
+}
+
+export default function(state, emitter) {
+  let lastRender = 0;
+  let updateTitle = false;
+
+  function render() {
+    emitter.emit('render');
+  }
+
+  async function checkFiles() {
+    const files = state.storage.files;
+    let rerender = false;
+    for (const file of files) {
+      const ok = await exists(file.id);
+      if (!ok) {
+        state.storage.remove(file.id);
+        rerender = true;
+      }
+    }
+    if (rerender) {
+      render();
+    }
+  }
+
+  function updateProgress() {
+    if (updateTitle) {
+      emitter.emit('DOMTitleChange', percent(state.transfer.progressRatio));
+    }
+    render();
+  }
+
+  emitter.on('DOMContentLoaded', () => {
+    document.addEventListener('blur', () => (updateTitle = true));
+    document.addEventListener('focus', () => {
+      updateTitle = false;
+      emitter.emit('DOMTitleChange', 'Firefox Send');
+    });
+    checkFiles();
+  });
+
+  emitter.on('navigate', checkFiles);
+
+  emitter.on('render', () => {
+    lastRender = Date.now();
+  });
+
+  emitter.on('delete', async ({ file, location }) => {
+    try {
+      metrics.deletedUpload({
+        size: file.size,
+        time: file.time,
+        speed: file.speed,
+        type: file.type,
+        ttl: file.expiresAt - Date.now(),
+        location
+      });
+      state.storage.remove(file.id);
+      await FileSender.delete(file.id, file.deleteToken);
+    } catch (e) {
+      state.raven.captureException(e);
+    }
+    state.fileInfo = null;
+  });
+
+  emitter.on('cancel', () => {
+    state.transfer.cancel();
+  });
+
+  emitter.on('upload', async ({ file, type }) => {
+    const size = file.size;
+    const sender = new FileSender(file);
+    sender.on('progress', updateProgress);
+    sender.on('encrypting', render);
+    state.transfer = sender;
+    render();
+    const links = openLinksInNewTab();
+    await delay(200);
+    try {
+      const start = Date.now();
+      metrics.startedUpload({ size, type });
+      const info = await sender.upload();
+      const time = Date.now() - start;
+      const speed = size / (time / 1000);
+      metrics.completedUpload({ size, time, speed, type });
+      document.getElementById('cancel-upload').hidden = 'hidden';
+      await delay(1000);
+      await fadeOut('upload-progress');
+      info.name = file.name;
+      info.size = size;
+      info.type = type;
+      info.time = time;
+      info.speed = speed;
+      info.createdAt = Date.now();
+      info.url = `${info.url}#${info.secretKey}`;
+      info.expiresAt = Date.now() + EXPIRE_SECONDS * 1000;
+      state.fileInfo = info;
+      state.storage.addFile(state.fileInfo);
+      openLinksInNewTab(links, false);
+      state.transfer = null;
+      state.storage.totalUploads += 1;
+      emitter.emit('pushState', `/share/${info.id}`);
+    } catch (err) {
+      console.error(err);
+      state.transfer = null;
+      if (err.message === '0') {
+        //cancelled. do nothing
+        metrics.cancelledUpload({ size, type });
+        return render();
+      }
+      state.raven.captureException(err);
+      metrics.stoppedUpload({ size, type, err });
+      emitter.emit('pushState', '/error');
+    }
+  });
+
+  emitter.on('password', async ({ password, file }) => {
+    try {
+      await FileSender.setPassword(password, file);
+      metrics.addedPassword({ size: file.size });
+      file.password = password;
+      state.storage.writeFiles();
+    } catch (e) {
+      console.error(e);
+    }
+    render();
+  });
+
+  emitter.on('preview', async () => {
+    const file = state.fileInfo;
+    const url = `/api/download/${file.id}`;
+    const receiver = new FileReceiver(url, file);
+    receiver.on('progress', updateProgress);
+    receiver.on('decrypting', render);
+    state.transfer = receiver;
+    try {
+      await receiver.getMetadata(file.nonce);
+    } catch (e) {
+      if (e.message === '401') {
+        file.password = null;
+        if (!file.pwd) {
+          return emitter.emit('pushState', '/404');
+        }
+      }
+    }
+    render();
+  });
+
+  emitter.on('download', async file => {
+    state.transfer.on('progress', render);
+    state.transfer.on('decrypting', render);
+    const links = openLinksInNewTab();
+    const size = file.size;
+    try {
+      const start = Date.now();
+      metrics.startedDownload({ size: file.size, ttl: file.ttl });
+      const f = await state.transfer.download(file.nonce);
+      const time = Date.now() - start;
+      const speed = size / (time / 1000);
+      await delay(1000);
+      await fadeOut('download-progress');
+      saveFile(f);
+      state.storage.totalDownloads += 1;
+      state.transfer = null;
+      metrics.completedDownload({ size, time, speed });
+      emitter.emit('pushState', '/completed');
+    } catch (err) {
+      console.error(err);
+      // TODO cancelled download
+      const location = err.message === 'notfound' ? '/404' : '/error';
+      if (location === '/error') {
+        state.raven.captureException(err);
+        metrics.stoppedDownload({ size, err });
+      }
+      emitter.emit('pushState', location);
+    } finally {
+      state.transfer = null;
+      openLinksInNewTab(links, false);
+    }
+  });
+
+  emitter.on('copy', ({ url, location }) => {
+    copyToClipboard(url);
+    metrics.copiedLink({ location });
+  });
+
+  setInterval(() => {
+    // poll for rerendering the file list countdown timers
+    if (
+      state.route === '/' &&
+      state.storage.files.length > 0 &&
+      Date.now() - lastRender > 30000
+    ) {
+      render();
+    }
+  }, 60000);
+}

app/fileReceiver.js

@@ -1,29 +1,110 @@
 import Nanobus from 'nanobus';
-import Keychain from './keychain';
+import { arrayToB64, b64ToArray, bytes } from './utils';
-import { delay, bytes, streamToArrayBuffer } from './utils';
-import { downloadFile, metadata, getApiUrl, reportLink } from './api';
-import { blobStream } from './streams';
-import Zip from './zip';
 
 export default class FileReceiver extends Nanobus {
-  constructor(fileInfo) {
+  constructor(url, file) {
     super('FileReceiver');
-    this.keychain = new Keychain(fileInfo.secretKey, fileInfo.nonce);
+    this.secretKeyPromise = window.crypto.subtle.importKey(
-    if (fileInfo.requiresPassword) {
+      'raw',
-      this.keychain.setPassword(fileInfo.password, fileInfo.url);
+      b64ToArray(file.key),
+      'HKDF',
+      false,
+      ['deriveKey']
+    );
+    this.encryptKeyPromise = this.secretKeyPromise.then(sk => {
+      const encoder = new TextEncoder();
+      return window.crypto.subtle.deriveKey(
+        {
+          name: 'HKDF',
+          salt: new Uint8Array(),
+          info: encoder.encode('encryption'),
+          hash: 'SHA-256'
+        },
+        sk,
+        {
+          name: 'AES-GCM',
+          length: 128
+        },
+        false,
+        ['decrypt']
+      );
+    });
+    if (file.pwd) {
+      const encoder = new TextEncoder();
+      this.authKeyPromise = window.crypto.subtle
+        .importKey(
+          'raw',
+          encoder.encode(file.password),
+          { name: 'PBKDF2' },
+          false,
+          ['deriveKey']
+        )
+        .then(pwdKey =>
+          window.crypto.subtle.deriveKey(
+            {
+              name: 'PBKDF2',
+              salt: encoder.encode(file.url),
+              iterations: 100,
+              hash: 'SHA-256'
+            },
+            pwdKey,
+            {
+              name: 'HMAC',
+              hash: 'SHA-256'
+            },
+            true,
+            ['sign']
+          )
+        );
+    } else {
+      this.authKeyPromise = this.secretKeyPromise.then(sk => {
+        const encoder = new TextEncoder();
+        return window.crypto.subtle.deriveKey(
+          {
+            name: 'HKDF',
+            salt: new Uint8Array(),
+            info: encoder.encode('authentication'),
+            hash: 'SHA-256'
+          },
+          sk,
+          {
+            name: 'HMAC',
+            hash: { name: 'SHA-256' }
+          },
+          false,
+          ['sign']
+        );
+      });
     }
-    this.fileInfo = fileInfo;
+    this.metaKeyPromise = this.secretKeyPromise.then(sk => {
-    this.reset();
+      const encoder = new TextEncoder();
+      return window.crypto.subtle.deriveKey(
+        {
+          name: 'HKDF',
+          salt: new Uint8Array(),
+          info: encoder.encode('metadata'),
+          hash: 'SHA-256'
+        },
+        sk,
+        {
+          name: 'AES-GCM',
+          length: 128
+        },
+        false,
+        ['decrypt']
+      );
+    });
+    this.file = file;
+    this.url = url;
+    this.msg = 'fileSizeProgress';
+    this.state = 'initialized';
+    this.progress = [0, 1];
   }
 
   get progressRatio() {
     return this.progress[0] / this.progress[1];
   }
 
-  get progressIndefinite() {
-    return this.state !== 'downloading';
-  }
-
   get sizes() {
     return {
       partialSize: bytes(this.progress[0]),
@@ -32,207 +113,139 @@ export default class FileReceiver extends Nanobus {
   }
 
   cancel() {
-    if (this.downloadRequest) {
+    // TODO
-      this.downloadRequest.cancel();
-    }
   }
 
-  reset() {
+  fetchMetadata(sig) {
-    this.msg = 'fileSizeProgress';
-    this.state = 'initialized';
-    this.progress = [0, 1];
-  }
-
-  async getMetadata() {
-    const meta = await metadata(this.fileInfo.id, this.keychain);
-    this.fileInfo.name = meta.name;
-    this.fileInfo.type = meta.type;
-    this.fileInfo.iv = meta.iv;
-    this.fileInfo.size = +meta.size;
-    this.fileInfo.manifest = meta.manifest;
-    this.state = 'ready';
-  }
-
-  async reportLink(reason) {
-    await reportLink(this.fileInfo.id, this.keychain, reason);
-  }
-
-  sendMessageToSw(msg) {
     return new Promise((resolve, reject) => {
-      const channel = new MessageChannel();
+      const xhr = new XMLHttpRequest();
-
+      xhr.onreadystatechange = () => {
-      channel.port1.onmessage = function(event) {
+        if (xhr.readyState === XMLHttpRequest.DONE) {
-        if (event.data === undefined) {
+          const nonce = xhr.getResponseHeader('WWW-Authenticate').split(' ')[1];
-          reject('bad response from serviceWorker');
+          this.file.nonce = nonce;
-        } else if (event.data.error !== undefined) {
+          if (xhr.status === 200) {
-          reject(event.data.error);
+            return resolve(xhr.response);
-        } else {
+          }
-          resolve(event.data);
+          reject(new Error(xhr.status));
         }
       };
-
+      xhr.onerror = () => reject(new Error(0));
-      navigator.serviceWorker.controller.postMessage(msg, [channel.port2]);
+      xhr.ontimeout = () => reject(new Error(0));
+      xhr.open('get', `/api/metadata/${this.file.id}`);
+      xhr.setRequestHeader('Authorization', `send-v1 ${arrayToB64(sig)}`);
+      xhr.responseType = 'json';
+      xhr.timeout = 2000;
+      xhr.send();
     });
   }
 
-  async downloadBlob(noSave = false) {
+  async getMetadata(nonce) {
-    this.state = 'downloading';
-    this.downloadRequest = await downloadFile(
-      this.fileInfo.id,
-      this.keychain,
-      p => {
-        this.progress = [p, this.fileInfo.size];
-        this.emit('progress');
-      }
-    );
     try {
-      const ciphertext = await this.downloadRequest.result;
+      const authKey = await this.authKeyPromise;
-      this.downloadRequest = null;
+      const sig = await window.crypto.subtle.sign(
-      this.msg = 'decryptingFile';
+        {
-      this.state = 'decrypting';
+          name: 'HMAC'
-      this.emit('decrypting');
+        },
-      let size = this.fileInfo.size;
+        authKey,
-      let plainStream = this.keychain.decryptStream(blobStream(ciphertext));
+        b64ToArray(nonce)
-      if (this.fileInfo.type === 'send-archive') {
+      );
-        const zip = new Zip(this.fileInfo.manifest, plainStream);
+      const data = await this.fetchMetadata(new Uint8Array(sig));
-        plainStream = zip.stream;
+      const metaKey = await this.metaKeyPromise;
-        size = zip.size;
+      const json = await window.crypto.subtle.decrypt(
-      }
+        {
-      const plaintext = await streamToArrayBuffer(plainStream, size);
+          name: 'AES-GCM',
-      if (!noSave) {
+          iv: new Uint8Array(12),
-        await saveFile({
+          tagLength: 128
-          plaintext,
+        },
-          name: decodeURIComponent(this.fileInfo.name),
+        metaKey,
-          type: this.fileInfo.type
+        b64ToArray(data.metadata)
-        });
+      );
-      }
+      const decoder = new TextDecoder();
-      this.msg = 'downloadFinish';
+      const meta = JSON.parse(decoder.decode(json));
-      this.emit('complete');
+      this.file.name = meta.name;
-      this.state = 'complete';
+      this.file.type = meta.type;
+      this.file.iv = meta.iv;
+      this.file.size = data.size;
+      this.file.ttl = data.ttl;
+      this.state = 'ready';
     } catch (e) {
-      this.downloadRequest = null;
+      this.state = 'invalid';
       throw e;
     }
   }
 
-  async downloadStream(noSave = false) {
+  downloadFile(sig) {
-    const start = Date.now();
+    return new Promise((resolve, reject) => {
-    const onprogress = p => {
+      const xhr = new XMLHttpRequest();
-      this.progress = [p, this.fileInfo.size];
-      this.emit('progress');
-    };
 
-    this.downloadRequest = {
+      xhr.onprogress = event => {
-      cancel: () => {
+        if (event.lengthComputable && event.target.status !== 404) {
-        this.sendMessageToSw({ request: 'cancel', id: this.fileInfo.id });
+          this.progress = [event.loaded, event.total];
-      }
+          this.emit('progress', this.progress);
-    };
+        }
-
-    try {
-      this.state = 'downloading';
-
-      const info = {
-        request: 'init',
-        id: this.fileInfo.id,
-        filename: this.fileInfo.name,
-        type: this.fileInfo.type,
-        manifest: this.fileInfo.manifest,
-        key: this.fileInfo.secretKey,
-        requiresPassword: this.fileInfo.requiresPassword,
-        password: this.fileInfo.password,
-        url: this.fileInfo.url,
-        size: this.fileInfo.size,
-        nonce: this.keychain.nonce,
-        noSave
       };
-      await this.sendMessageToSw(info);
 
-      onprogress(0);
+      xhr.onload = event => {
+        if (xhr.status === 404) {
+          reject(new Error('notfound'));
+          return;
+        }
 
-      if (noSave) {
+        if (xhr.status !== 200) {
-        const res = await fetch(getApiUrl(`/api/download/${this.fileInfo.id}`));
+          return reject(new Error(xhr.status));
-        if (res.status !== 200) {
-          throw new Error(res.status);
         }
-      } else {
-        const downloadPath = `/api/download/${this.fileInfo.id}`;
-        let downloadUrl = getApiUrl(downloadPath);
-        if (downloadUrl === downloadPath) {
-          downloadUrl = `${location.protocol}//${location.host}${downloadPath}`;
-        }
-        const a = document.createElement('a');
-        a.href = downloadUrl;
-        document.body.appendChild(a);
-        a.click();
-      }
 
-      let prog = 0;
+        const blob = new Blob([xhr.response]);
-      let hangs = 0;
+        const fileReader = new FileReader();
-      while (prog < this.fileInfo.size) {
+        fileReader.onload = function() {
-        const msg = await this.sendMessageToSw({
+          resolve(this.result);
-          request: 'progress',
+        };
-          id: this.fileInfo.id
-        });
-        if (msg.progress === prog) {
-          hangs++;
-        } else {
-          hangs = 0;
-        }
-        if (hangs > 30) {
-          // TODO: On Chrome we don't get a cancel
-          // signal so one is indistinguishable from
-          // a hang. We may be able to detect
-          // which end is hung in the service worker
-          // to improve on this.
-          const e = new Error('hung download');
-          e.duration = Date.now() - start;
-          e.size = this.fileInfo.size;
-          e.progress = prog;
-          throw e;
-        }
-        prog = msg.progress;
-        onprogress(prog);
-        await delay(1000);
-      }
 
-      this.downloadRequest = null;
+        fileReader.readAsArrayBuffer(blob);
+      };
+
+      xhr.open('get', this.url);
+      xhr.setRequestHeader('Authorization', `send-v1 ${arrayToB64(sig)}`);
+      xhr.responseType = 'blob';
+      xhr.send();
+    });
+  }
+
+  async download(nonce) {
+    this.state = 'downloading';
+    this.emit('progress', this.progress);
+    try {
+      const encryptKey = await this.encryptKeyPromise;
+      const authKey = await this.authKeyPromise;
+      const sig = await window.crypto.subtle.sign(
+        {
+          name: 'HMAC'
+        },
+        authKey,
+        b64ToArray(nonce)
+      );
+      const ciphertext = await this.downloadFile(new Uint8Array(sig));
+      this.msg = 'decryptingFile';
+      this.emit('decrypting');
+      const plaintext = await window.crypto.subtle.decrypt(
+        {
+          name: 'AES-GCM',
+          iv: b64ToArray(this.file.iv),
+          tagLength: 128
+        },
+        encryptKey,
+        ciphertext
+      );
       this.msg = 'downloadFinish';
-      this.emit('complete');
       this.state = 'complete';
+      return {
+        plaintext,
+        name: decodeURIComponent(this.file.name),
+        type: this.file.type
+      };
     } catch (e) {
-      this.downloadRequest = null;
+      this.state = 'invalid';
-      if (e === 'cancelled' || e.message === '400') {
-        throw new Error(0);
-      }
       throw e;
     }
   }
-
-  download(options) {
-    if (options.stream) {
-      return this.downloadStream(options.noSave);
-    }
-    return this.downloadBlob(options.noSave);
-  }
-}
-
-async function saveFile(file) {
-  return new Promise(function(resolve, reject) {
-    const dataView = new DataView(file.plaintext);
-    const blob = new Blob([dataView], { type: file.type });
-
-    if (navigator.msSaveBlob) {
-      navigator.msSaveBlob(blob, file.name);
-      return resolve();
-    } else {
-      const downloadUrl = URL.createObjectURL(blob);
-      const a = document.createElement('a');
-      a.href = downloadUrl;
-      a.download = file.name;
-      document.body.appendChild(a);
-      a.click();
-      URL.revokeObjectURL(downloadUrl);
-      setTimeout(resolve, 100);
-    }
-  });
 }

app/fileSender.js

@@ -1,27 +1,48 @@
 import Nanobus from 'nanobus';
-import OwnedFile from './ownedFile';
+import { arrayToB64, b64ToArray, bytes } from './utils';
-import Keychain from './keychain';
-import { arrayToB64, bytes } from './utils';
-import { uploadWs } from './api';
-import { encryptedSize } from './utils';
 
 export default class FileSender extends Nanobus {
-  constructor() {
+  constructor(file) {
     super('FileSender');
-    this.keychain = new Keychain();
+    this.file = file;
-    this.reset();
+    this.msg = 'importingFile';
+    this.progress = [0, 1];
+    this.cancelled = false;
+    this.iv = window.crypto.getRandomValues(new Uint8Array(12));
+    this.uploadXHR = new XMLHttpRequest();
+    this.rawSecret = window.crypto.getRandomValues(new Uint8Array(16));
+    this.secretKey = window.crypto.subtle.importKey(
+      'raw',
+      this.rawSecret,
+      'HKDF',
+      false,
+      ['deriveKey']
+    );
+  }
+
+  static delete(id, token) {
+    return new Promise((resolve, reject) => {
+      if (!id || !token) {
+        return reject();
+      }
+      const xhr = new XMLHttpRequest();
+      xhr.open('POST', `/api/delete/${id}`);
+      xhr.setRequestHeader('Content-Type', 'application/json');
+
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState === XMLHttpRequest.DONE) {
+          resolve();
+        }
+      };
+
+      xhr.send(JSON.stringify({ delete_token: token }));
+    });
   }
 
   get progressRatio() {
     return this.progress[0] / this.progress[1];
   }
 
-  get progressIndefinite() {
-    return (
-      ['fileSizeProgress', 'notifyUploadEncryptDone'].indexOf(this.msg) === -1
-    );
-  }
-
   get sizes() {
     return {
       partialSize: bytes(this.progress[0]),
@@ -29,78 +50,242 @@ export default class FileSender extends Nanobus {
     };
   }
 
-  reset() {
-    this.uploadRequest = null;
-    this.msg = 'importingFile';
-    this.progress = [0, 1];
-    this.cancelled = false;
-  }
-
   cancel() {
     this.cancelled = true;
-    if (this.uploadRequest) {
+    if (this.msg === 'fileSizeProgress') {
-      this.uploadRequest.cancel();
+      this.uploadXHR.abort();
     }
   }
 
-  async upload(archive, bearerToken) {
+  readFile() {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsArrayBuffer(this.file);
+      reader.onload = function(event) {
+        const plaintext = new Uint8Array(this.result);
+        resolve(plaintext);
+      };
+      reader.onerror = function(err) {
+        reject(err);
+      };
+    });
+  }
+
+  uploadFile(encrypted, metadata, rawAuth) {
+    return new Promise((resolve, reject) => {
+      const dataView = new DataView(encrypted);
+      const blob = new Blob([dataView], { type: 'application/octet-stream' });
+      const fd = new FormData();
+      fd.append('data', blob);
+
+      const xhr = this.uploadXHR;
+
+      xhr.upload.addEventListener('progress', e => {
+        if (e.lengthComputable) {
+          this.progress = [e.loaded, e.total];
+          this.emit('progress', this.progress);
+        }
+      });
+
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState === XMLHttpRequest.DONE) {
+          if (xhr.status === 200) {
+            const nonce = xhr
+              .getResponseHeader('WWW-Authenticate')
+              .split(' ')[1];
+            this.progress = [1, 1];
+            this.msg = 'notifyUploadDone';
+            const responseObj = JSON.parse(xhr.responseText);
+            return resolve({
+              url: responseObj.url,
+              id: responseObj.id,
+              secretKey: arrayToB64(this.rawSecret),
+              deleteToken: responseObj.delete,
+              nonce
+            });
+          }
+          this.msg = 'errorPageHeader';
+          reject(new Error(xhr.status));
+        }
+      };
+
+      xhr.open('post', '/api/upload', true);
+      xhr.setRequestHeader(
+        'X-File-Metadata',
+        arrayToB64(new Uint8Array(metadata))
+      );
+      xhr.setRequestHeader('Authorization', `send-v1 ${arrayToB64(rawAuth)}`);
+      xhr.send(fd);
+      this.msg = 'fileSizeProgress';
+    });
+  }
+
+  async upload() {
+    const encoder = new TextEncoder();
+    const secretKey = await this.secretKey;
+    const encryptKey = await window.crypto.subtle.deriveKey(
+      {
+        name: 'HKDF',
+        salt: new Uint8Array(),
+        info: encoder.encode('encryption'),
+        hash: 'SHA-256'
+      },
+      secretKey,
+      {
+        name: 'AES-GCM',
+        length: 128
+      },
+      false,
+      ['encrypt']
+    );
+    const authKey = await window.crypto.subtle.deriveKey(
+      {
+        name: 'HKDF',
+        salt: new Uint8Array(),
+        info: encoder.encode('authentication'),
+        hash: 'SHA-256'
+      },
+      secretKey,
+      {
+        name: 'HMAC',
+        hash: 'SHA-256'
+      },
+      true,
+      ['sign']
+    );
+    const metaKey = await window.crypto.subtle.deriveKey(
+      {
+        name: 'HKDF',
+        salt: new Uint8Array(),
+        info: encoder.encode('metadata'),
+        hash: 'SHA-256'
+      },
+      secretKey,
+      {
+        name: 'AES-GCM',
+        length: 128
+      },
+      false,
+      ['encrypt']
+    );
+    const plaintext = await this.readFile();
     if (this.cancelled) {
       throw new Error(0);
     }
     this.msg = 'encryptingFile';
     this.emit('encrypting');
-    const totalSize = encryptedSize(archive.size);
+    const encrypted = await window.crypto.subtle.encrypt(
-    const encStream = await this.keychain.encryptStream(archive.stream);
+      {
-    const metadata = await this.keychain.encryptMetadata(archive);
+        name: 'AES-GCM',
-    const authKeyB64 = await this.keychain.authKeyB64();
+        iv: this.iv,
-
+        tagLength: 128
-    this.uploadRequest = uploadWs(
+      },
-      encStream,
+      encryptKey,
-      metadata,
+      plaintext
-      authKeyB64,
-      archive.timeLimit,
-      archive.dlimit,
-      bearerToken,
-      p => {
-        this.progress = [p, totalSize];
-        this.emit('progress');
-      }
     );
-
+    const metadata = await window.crypto.subtle.encrypt(
+      {
+        name: 'AES-GCM',
+        iv: new Uint8Array(12),
+        tagLength: 128
+      },
+      metaKey,
+      encoder.encode(
+        JSON.stringify({
+          iv: arrayToB64(this.iv),
+          name: this.file.name,
+          type: this.file.type || 'application/octet-stream'
+        })
+      )
+    );
+    const rawAuth = await window.crypto.subtle.exportKey('raw', authKey);
     if (this.cancelled) {
       throw new Error(0);
     }
+    return this.uploadFile(encrypted, metadata, new Uint8Array(rawAuth));
+  }
 
-    this.msg = 'fileSizeProgress';
+  static async setPassword(password, file) {
-    this.emit('progress'); // HACK to kick MS Edge
+    const encoder = new TextEncoder();
-    try {
+    const secretKey = await window.crypto.subtle.importKey(
-      const result = await this.uploadRequest.result;
+      'raw',
-      this.msg = 'notifyUploadEncryptDone';
+      b64ToArray(file.secretKey),
-      this.uploadRequest = null;
+      'HKDF',
-      this.progress = [1, 1];
+      false,
-      const secretKey = arrayToB64(this.keychain.rawSecret);
+      ['deriveKey']
-      const ownedFile = new OwnedFile({
+    );
-        id: result.id,
+    const authKey = await window.crypto.subtle.deriveKey(
-        url: `${result.url}#${secretKey}`,
+      {
-        name: archive.name,
+        name: 'HKDF',
-        size: archive.size,
+        salt: new Uint8Array(),
-        manifest: archive.manifest,
+        info: encoder.encode('authentication'),
-        time: result.duration,
+        hash: 'SHA-256'
-        speed: archive.size / (result.duration / 1000),
+      },
-        createdAt: Date.now(),
+      secretKey,
-        expiresAt: Date.now() + archive.timeLimit * 1000,
+      {
-        secretKey: secretKey,
+        name: 'HMAC',
-        nonce: this.keychain.nonce,
+        hash: 'SHA-256'
-        ownerToken: result.ownerToken,
+      },
-        dlimit: archive.dlimit,
+      true,
-        timeLimit: archive.timeLimit
+      ['sign']
-      });
+    );
-
+    const sig = await window.crypto.subtle.sign(
-      return ownedFile;
+      {
-    } catch (e) {
+        name: 'HMAC'
-      this.msg = 'errorPageHeader';
+      },
-      this.uploadRequest = null;
+      authKey,
-      throw e;
+      b64ToArray(file.nonce)
-    }
+    );
+    const pwdKey = await window.crypto.subtle.importKey(
+      'raw',
+      encoder.encode(password),
+      { name: 'PBKDF2' },
+      false,
+      ['deriveKey']
+    );
+    const newAuthKey = await window.crypto.subtle.deriveKey(
+      {
+        name: 'PBKDF2',
+        salt: encoder.encode(file.url),
+        iterations: 100,
+        hash: 'SHA-256'
+      },
+      pwdKey,
+      {
+        name: 'HMAC',
+        hash: 'SHA-256'
+      },
+      true,
+      ['sign']
+    );
+    const rawAuth = await window.crypto.subtle.exportKey('raw', newAuthKey);
+    return new Promise((resolve, reject) => {
+      const xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState === XMLHttpRequest.DONE) {
+          if (xhr.status === 200) {
+            return resolve(xhr.response);
+          }
+          if (xhr.status === 401) {
+            const nonce = xhr
+              .getResponseHeader('WWW-Authenticate')
+              .split(' ')[1];
+            file.nonce = nonce;
+          }
+          reject(new Error(xhr.status));
+        }
+      };
+      xhr.onerror = () => reject(new Error(0));
+      xhr.ontimeout = () => reject(new Error(0));
+      xhr.open('post', `/api/password/${file.id}`);
+      xhr.setRequestHeader(
+        'Authorization',
+        `send-v1 ${arrayToB64(new Uint8Array(sig))}`
+      );
+      xhr.setRequestHeader('Content-Type', 'application/json');
+      xhr.responseType = 'json';
+      xhr.timeout = 2000;
+      xhr.send(JSON.stringify({ auth: arrayToB64(new Uint8Array(rawAuth)) }));
+    });
   }
 }

app/fxa.js

@@ -1,181 +0,0 @@
-/* global AUTH_CONFIG */
-import { arrayToB64, b64ToArray } from './utils';
-
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
-
-function getOtherInfo(enc) {
-  const name = encoder.encode(enc);
-  const length = 256;
-  const buffer = new ArrayBuffer(name.length + 16);
-  const dv = new DataView(buffer);
-  const result = new Uint8Array(buffer);
-  let i = 0;
-  dv.setUint32(i, name.length);
-  i += 4;
-  result.set(name, i);
-  i += name.length;
-  dv.setUint32(i, 0);
-  i += 4;
-  dv.setUint32(i, 0);
-  i += 4;
-  dv.setUint32(i, length);
-  return result;
-}
-
-function concat(b1, b2) {
-  const result = new Uint8Array(b1.length + b2.length);
-  result.set(b1, 0);
-  result.set(b2, b1.length);
-  return result;
-}
-
-async function concatKdf(key, enc) {
-  if (key.length !== 32) {
-    throw new Error('unsupported key length');
-  }
-  const otherInfo = getOtherInfo(enc);
-  const buffer = new ArrayBuffer(4 + key.length + otherInfo.length);
-  const dv = new DataView(buffer);
-  const concat = new Uint8Array(buffer);
-  dv.setUint32(0, 1);
-  concat.set(key, 4);
-  concat.set(otherInfo, key.length + 4);
-  const result = await crypto.subtle.digest('SHA-256', concat);
-  return new Uint8Array(result);
-}
-
-export async function prepareScopedBundleKey(storage) {
-  const keys = await crypto.subtle.generateKey(
-    {
-      name: 'ECDH',
-      namedCurve: 'P-256'
-    },
-    true,
-    ['deriveBits']
-  );
-  const privateJwk = await crypto.subtle.exportKey('jwk', keys.privateKey);
-  const publicJwk = await crypto.subtle.exportKey('jwk', keys.publicKey);
-  const kid = await crypto.subtle.digest(
-    'SHA-256',
-    encoder.encode(JSON.stringify(publicJwk))
-  );
-  privateJwk.kid = kid;
-  publicJwk.kid = kid;
-  storage.set('scopedBundlePrivateKey', JSON.stringify(privateJwk));
-  return arrayToB64(encoder.encode(JSON.stringify(publicJwk)));
-}
-
-export async function decryptBundle(storage, bundle) {
-  const privateJwk = JSON.parse(storage.get('scopedBundlePrivateKey'));
-  storage.remove('scopedBundlePrivateKey');
-  const privateKey = await crypto.subtle.importKey(
-    'jwk',
-    privateJwk,
-    {
-      name: 'ECDH',
-      namedCurve: 'P-256'
-    },
-    false,
-    ['deriveBits']
-  );
-  const jweParts = bundle.split('.');
-  if (jweParts.length !== 5) {
-    throw new Error('invalid jwe');
-  }
-  const header = JSON.parse(decoder.decode(b64ToArray(jweParts[0])));
-  const additionalData = encoder.encode(jweParts[0]);
-  const iv = b64ToArray(jweParts[2]);
-  const ciphertext = b64ToArray(jweParts[3]);
-  const tag = b64ToArray(jweParts[4]);
-
-  if (header.alg !== 'ECDH-ES' || header.enc !== 'A256GCM') {
-    throw new Error('unsupported jwe type');
-  }
-
-  const publicKey = await crypto.subtle.importKey(
-    'jwk',
-    header.epk,
-    {
-      name: 'ECDH',
-      namedCurve: 'P-256'
-    },
-    false,
-    []
-  );
-  const sharedBits = await crypto.subtle.deriveBits(
-    {
-      name: 'ECDH',
-      public: publicKey
-    },
-    privateKey,
-    256
-  );
-
-  const rawSharedKey = await concatKdf(new Uint8Array(sharedBits), header.enc);
-  const sharedKey = await crypto.subtle.importKey(
-    'raw',
-    rawSharedKey,
-    {
-      name: 'AES-GCM'
-    },
-    false,
-    ['decrypt']
-  );
-
-  const plaintext = await crypto.subtle.decrypt(
-    {
-      name: 'AES-GCM',
-      iv: iv,
-      additionalData: additionalData,
-      tagLength: tag.length * 8
-    },
-    sharedKey,
-    concat(ciphertext, tag)
-  );
-
-  return JSON.parse(decoder.decode(plaintext));
-}
-
-export async function preparePkce(storage) {
-  const verifier = arrayToB64(crypto.getRandomValues(new Uint8Array(64)));
-  storage.set('pkceVerifier', verifier);
-  const challenge = await crypto.subtle.digest(
-    'SHA-256',
-    encoder.encode(verifier)
-  );
-  return arrayToB64(new Uint8Array(challenge));
-}
-
-export async function deriveFileListKey(ikm) {
-  const baseKey = await crypto.subtle.importKey(
-    'raw',
-    b64ToArray(ikm),
-    { name: 'HKDF' },
-    false,
-    ['deriveKey']
-  );
-  const fileListKey = await crypto.subtle.deriveKey(
-    {
-      name: 'HKDF',
-      salt: new Uint8Array(),
-      info: encoder.encode('fileList'),
-      hash: 'SHA-256'
-    },
-    baseKey,
-    {
-      name: 'AES-GCM',
-      length: 128
-    },
-    true,
-    ['encrypt', 'decrypt']
-  );
-  const rawFileListKey = await crypto.subtle.exportKey('raw', fileListKey);
-  return arrayToB64(new Uint8Array(rawFileListKey));
-}
-
-export async function getFileListKey(storage, bundle) {
-  const jwks = await decryptBundle(storage, bundle);
-  const jwk = jwks[AUTH_CONFIG.key_scope];
-  return deriveFileListKey(jwk.k);
-}

app/keychain.js

@@ -1,164 +0,0 @@
-import { arrayToB64, b64ToArray } from './utils';
-import { decryptStream, encryptStream } from './ece.js';
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
-
-export default class Keychain {
-  constructor(secretKeyB64, nonce) {
-    this._nonce = nonce || 'yRCdyQ1EMSA3mo4rqSkuNQ==';
-    if (secretKeyB64) {
-      this.rawSecret = b64ToArray(secretKeyB64);
-    } else {
-      this.rawSecret = crypto.getRandomValues(new Uint8Array(16));
-    }
-    this.secretKeyPromise = crypto.subtle.importKey(
-      'raw',
-      this.rawSecret,
-      'HKDF',
-      false,
-      ['deriveKey']
-    );
-    this.metaKeyPromise = this.secretKeyPromise.then(function(secretKey) {
-      return crypto.subtle.deriveKey(
-        {
-          name: 'HKDF',
-          salt: new Uint8Array(),
-          info: encoder.encode('metadata'),
-          hash: 'SHA-256'
-        },
-        secretKey,
-        {
-          name: 'AES-GCM',
-          length: 128
-        },
-        false,
-        ['encrypt', 'decrypt']
-      );
-    });
-    this.authKeyPromise = this.secretKeyPromise.then(function(secretKey) {
-      return crypto.subtle.deriveKey(
-        {
-          name: 'HKDF',
-          salt: new Uint8Array(),
-          info: encoder.encode('authentication'),
-          hash: 'SHA-256'
-        },
-        secretKey,
-        {
-          name: 'HMAC',
-          hash: { name: 'SHA-256' }
-        },
-        true,
-        ['sign']
-      );
-    });
-  }
-
-  get nonce() {
-    return this._nonce;
-  }
-
-  set nonce(n) {
-    if (n && n !== this._nonce) {
-      this._nonce = n;
-    }
-  }
-
-  setPassword(password, shareUrl) {
-    this.authKeyPromise = crypto.subtle
-      .importKey('raw', encoder.encode(password), { name: 'PBKDF2' }, false, [
-        'deriveKey'
-      ])
-      .then(passwordKey =>
-        crypto.subtle.deriveKey(
-          {
-            name: 'PBKDF2',
-            salt: encoder.encode(shareUrl),
-            iterations: 100,
-            hash: 'SHA-256'
-          },
-          passwordKey,
-          {
-            name: 'HMAC',
-            hash: 'SHA-256'
-          },
-          true,
-          ['sign']
-        )
-      );
-  }
-
-  setAuthKey(authKeyB64) {
-    this.authKeyPromise = crypto.subtle.importKey(
-      'raw',
-      b64ToArray(authKeyB64),
-      {
-        name: 'HMAC',
-        hash: 'SHA-256'
-      },
-      true,
-      ['sign']
-    );
-  }
-
-  async authKeyB64() {
-    const authKey = await this.authKeyPromise;
-    const rawAuth = await crypto.subtle.exportKey('raw', authKey);
-    return arrayToB64(new Uint8Array(rawAuth));
-  }
-
-  async authHeader() {
-    const authKey = await this.authKeyPromise;
-    const sig = await crypto.subtle.sign(
-      {
-        name: 'HMAC'
-      },
-      authKey,
-      b64ToArray(this.nonce)
-    );
-    return `send-v1 ${arrayToB64(new Uint8Array(sig))}`;
-  }
-
-  async encryptMetadata(metadata) {
-    const metaKey = await this.metaKeyPromise;
-    const ciphertext = await crypto.subtle.encrypt(
-      {
-        name: 'AES-GCM',
-        iv: new Uint8Array(12),
-        tagLength: 128
-      },
-      metaKey,
-      encoder.encode(
-        JSON.stringify({
-          name: metadata.name,
-          size: metadata.size,
-          type: metadata.type || 'application/octet-stream',
-          manifest: metadata.manifest || {}
-        })
-      )
-    );
-    return ciphertext;
-  }
-
-  encryptStream(plainStream) {
-    return encryptStream(plainStream, this.rawSecret);
-  }
-
-  decryptStream(cryptotext) {
-    return decryptStream(cryptotext, this.rawSecret);
-  }
-
-  async decryptMetadata(ciphertext) {
-    const metaKey = await this.metaKeyPromise;
-    const plaintext = await crypto.subtle.decrypt(
-      {
-        name: 'AES-GCM',
-        iv: new Uint8Array(12),
-        tagLength: 128
-      },
-      metaKey,
-      ciphertext
-    );
-    return JSON.parse(decoder.decode(plaintext));
-  }
-}

app/locale.js

@@ -1,26 +0,0 @@
-import { FluentBundle, FluentResource } from '@fluent/bundle';
-
-function makeBundle(locale, ftl) {
-  const bundle = new FluentBundle(locale, { useIsolating: false });
-  bundle.addResource(new FluentResource(ftl));
-  return bundle;
-}
-
-export async function getTranslator(locale) {
-  const bundles = [];
-  const { default: en } = await import('../public/locales/en-US/send.ftl');
-  if (locale !== 'en-US') {
-    const { default: ftl } = await import(
-      `../public/locales/${locale}/send.ftl`
-    );
-    bundles.push(makeBundle(locale, ftl));
-  }
-  bundles.push(makeBundle('en-US', en));
-  return function(id, data) {
-    for (let bundle of bundles) {
-      if (bundle.hasMessage(id)) {
-        return bundle.formatPattern(bundle.getMessage(id).value, data);
-      }
-    }
-  };
-}

app/main.css

@@ -1,412 +0,0 @@
-@tailwind base;
-
-html {
-  line-height: 1.15;
-}
-
-@tailwind components;
-
-:not(input) {
-  user-select: none;
-}
-
-:root {
-  --violet-gradient: linear-gradient(
-    -180deg,
-    rgb(144 89 255 / 80%) 0%,
-    rgb(144 89 255 / 40%) 100%
-  );
-}
-
-a {
-  color: inherit;
-  text-decoration: none;
-}
-
-a:focus {
-  outline: 1px dotted grey;
-}
-
-body {
-  background-image: url('../assets/bg.svg');
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: cover;
-  overflow-x: hidden;
-}
-
-.btn {
-  @apply bg-primary;
-  @apply text-white;
-  @apply cursor-pointer;
-  @apply py-4;
-  @apply px-6;
-  @apply font-semibold;
-}
-
-.btn:hover {
-  @apply bg-primary_accent;
-}
-
-.btn:focus {
-  @apply bg-primary_accent;
-}
-
-.checkbox {
-  @apply leading-normal;
-  @apply select-none;
-}
-
-.checkbox > input[type='checkbox'] {
-  @apply absolute;
-  @apply opacity-0;
-}
-
-.checkbox > label {
-  @apply cursor-pointer;
-}
-
-.checkbox > label::before {
-  /* @apply bg-grey-10; */
-  @apply border-default;
-  @apply rounded-sm;
-
-  content: '';
-  height: 1.5rem;
-  width: 1.5rem;
-  margin-right: 0.5rem;
-  float: left;
-}
-
-.checkbox > label:hover::before {
-  @apply border-primary;
-}
-
-.checkbox > input:focus + label::before {
-  @apply border-primary;
-}
-
-.checkbox > input:checked + label::before {
-  @apply bg-primary;
-  @apply border-primary;
-
-  background-image: url('../assets/lock.svg');
-  background-position: center;
-  background-size: 1.25rem;
-  background-repeat: no-repeat;
-}
-
-.checkbox > input:disabled + label {
-  cursor: auto;
-}
-
-.checkbox > input:disabled + label::before {
-  @apply bg-primary;
-  @apply border-primary;
-
-  background-image: url('../assets/lock.svg');
-  background-position: center;
-  background-size: 1.25rem;
-  background-repeat: no-repeat;
-  cursor: auto;
-}
-
-details {
-  overflow: hidden;
-}
-
-details > summary::marker {
-  display: none;
-}
-
-details > summary > svg {
-  transition: all 0.25s cubic-bezier(0.07, 0.95, 0, 1);
-}
-
-details[open] {
-  overflow-y: auto;
-}
-
-details[open] > summary > svg {
-  transform: rotate(90deg);
-}
-
-footer li a:hover {
-  text-decoration: underline;
-}
-
-.feedback-link {
-  background-color: #000;
-  background-image: url('../assets/feedback.svg');
-  background-position: 0.125rem 0.25rem;
-  background-repeat: no-repeat;
-  background-size: 1.125rem;
-  color: #fff;
-  display: block;
-  font-size: 0.75rem;
-  line-height: 0.75rem;
-  padding: 0.375rem 0.375rem 0.375rem 1.25rem;
-  text-indent: 0.125rem;
-  white-space: nowrap;
-}
-
-.link-primary {
-  @apply text-primary;
-}
-
-.link-primary:hover {
-  @apply text-primary_accent;
-}
-
-.link-primary:focus {
-  @apply text-primary_accent;
-}
-
-.main-header img {
-  height: 32px;
-  width: auto;
-}
-
-.text-underline {
-  text-decoration: underline;
-}
-
-.d-block {
-  display: block;
-}
-
-.d-inline-block {
-  display: inline-block;
-}
-
-.align-middle {
-  vertical-align: middle;
-}
-
-.main {
-  display: flex;
-  position: relative;
-  max-width: 64rem;
-  width: 100%;
-}
-
-.main > section {
-  @apply bg-white;
-}
-
-#password-msg::after {
-  content: '\200b';
-}
-
-progress {
-  @apply bg-grey-30;
-  @apply rounded-sm;
-  @apply w-full;
-  @apply h-1;
-}
-
-progress::-webkit-progress-bar {
-  @apply bg-grey-30;
-  @apply rounded-sm;
-  @apply w-full;
-  @apply h-1;
-}
-
-progress::-webkit-progress-value {
-  /* stylelint-disable */
-  background-image: -webkit-linear-gradient(
-      -45deg,
-      transparent 20%,
-      rgb(255 255 255 / 40%) 20%,
-      rgb(255 255 255 / 40%) 40%,
-      transparent 40%,
-      transparent 60%,
-      rgb(255 255 255 / 40%) 60%,
-      rgb(255 255 255 / 40%) 80%,
-      transparent 80%
-    ),
-    -webkit-linear-gradient(left, var(--color-primary), var(--color-primary));
-  /* stylelint-enable */
-  border-radius: 2px;
-  background-size: 21px 20px, 100% 100%, 100% 100%;
-}
-
-progress::-moz-progress-bar {
-  /* stylelint-disable */
-  background-image: -moz-linear-gradient(
-      135deg,
-      transparent 20%,
-      rgb(255 255 255 / 40%) 20%,
-      rgb(255 255 255 / 40%) 40%,
-      transparent 40%,
-      transparent 60%,
-      rgb(255 255 255 / 40%) 60%,
-      rgb(255 255 255 / 40%) 80%,
-      transparent 80%
-    ),
-    -moz-linear-gradient(left, var(--color-primary), var(--color-primary));
-  /* stylelint-enable */
-  border-radius: 2px;
-  background-size: 21px 20px, 100% 100%, 100% 100%;
-  animation: animate-stripes 1s linear infinite;
-}
-
-@keyframes animate-stripes {
-  100% {
-    background-position: -21px 0;
-  }
-}
-
-select {
-  background-image: url('../assets/select-arrow.svg');
-  background-position: calc(100% - 0.75rem);
-  background-repeat: no-repeat;
-}
-
-@screen md {
-  .main-header img {
-    height: 48px;
-    width: auto;
-  }
-
-  .main {
-    @apply flex-1;
-    @apply self-center;
-    @apply items-center;
-    @apply m-auto;
-    @apply py-8;
-
-    max-height: 42rem;
-    width: calc(100% - 3rem);
-  }
-}
-
-@screen dark {
-  body {
-    @apply text-grey-10;
-
-    background-image: unset;
-  }
-
-  .btn {
-    @apply bg-primary;
-    @apply text-white;
-  }
-
-  .btn:hover {
-    @apply bg-primary_accent;
-  }
-
-  .btn:focus {
-    @apply bg-primary_accent;
-  }
-
-  .link-primary {
-    @apply text-primary;
-  }
-
-  .link-primary:hover {
-    @apply text-primary_accent;
-  }
-
-  .link-primary:focus {
-    @apply text-primary_accent;
-  }
-
-  .main > section {
-    @apply bg-grey-90;
-  }
-
-  @screen md {
-    .main > section {
-      @apply border-default;
-      @apply border-grey-80;
-    }
-  }
-}
-
-@tailwind utilities;
-
-@responsive {
-  .shadow-light {
-    box-shadow: 0 0 8px 0 rgb(12 12 13 / 10%);
-  }
-
-  .shadow-big {
-    box-shadow: 0 12px 18px 2px rgb(34 0 51 / 4%),
-      0 6px 22px 4px rgb(7 48 114 / 12%), 0 6px 10px -4px rgb(14 13 26 / 12%);
-  }
-}
-
-@variants focus {
-  .outline {
-    outline: 1px dotted grey;
-  }
-}
-
-.word-break-all {
-  word-break: break-all;
-  line-break: anywhere;
-}
-
-.signin {
-  backface-visibility: hidden;
-  border-radius: 6px;
-  transition-property: transform, background-color;
-  transition-duration: 250ms;
-  transition-timing-function: cubic-bezier(0.07, 0.95, 0, 1);
-}
-
-.signin:hover,
-.signin:focus {
-  transform: scale(1.0625);
-}
-
-.signin:hover:active {
-  transform: scale(0.9375);
-}
-
-/* begin signin button color experiment */
-
-.white-primary {
-  @apply border-primary;
-  @apply border-2;
-  @apply text-primary;
-}
-
-.white-primary:hover,
-.white-primary:focus {
-  @apply bg-primary;
-  @apply text-white;
-}
-
-.primary {
-  @apply bg-primary;
-  @apply text-white;
-}
-
-.white-violet {
-  @apply border-violet;
-  @apply border-2;
-  @apply text-violet;
-}
-
-.white-violet:hover,
-.white-violet:focus {
-  @apply bg-violet;
-  @apply text-white;
-
-  background-image: var(--violet-gradient);
-}
-
-.violet {
-  @apply bg-violet;
-  @apply text-white;
-}
-
-.violet:hover,
-.violet:focus {
-  background-image: var(--violet-gradient);
-}
-
-/* end signin button color experiment */

app/main.js

@@ -1,74 +1,50 @@
-/* global DEFAULTS LIMITS WEB_UI PREFS */
+import app from './routes';
-import 'core-js';
+import locale from '../common/locales';
-import 'fast-text-encoding'; // MS Edge support
+import fileManager from './fileManager';
-import 'intl-pluralrules';
-import choo from 'choo';
-import nanotiming from 'nanotiming';
-import routes from './routes';
-import getCapabilities from './capabilities';
-import controller from './controller';
 import dragManager from './dragManager';
-import pasteManager from './pasteManager';
+import { canHasSend } from './utils';
+import assets from '../common/assets';
 import storage from './storage';
+import metrics from './metrics';
 import experiments from './experiments';
-import * as Sentry from '@sentry/browser';
+import Raven from 'raven-js';
-import './main.css';
-import User from './user';
-import { getTranslator } from './locale';
-import Archive from './archive';
-import { setTranslate, locale } from './utils';
 
-if (navigator.doNotTrack !== '1' && window.SENTRY_CONFIG) {
+if (navigator.doNotTrack !== '1' && window.RAVEN_CONFIG) {
-  Sentry.init(window.SENTRY_CONFIG);
+  Raven.config(window.SENTRY_ID, window.RAVEN_CONFIG).install();
 }
 
-if (process.env.NODE_ENV === 'production') {
+app.use((state, emitter) => {
-  nanotiming.disabled = true;
+  // init state
-}
+  state.transfer = null;
-
+  state.fileInfo = null;
-(async function start() {
+  state.translate = locale.getTranslator();
-  const capabilities = await getCapabilities();
+  state.storage = storage;
-  if (
+  state.raven = Raven;
-    !capabilities.crypto &&
+  emitter.on('DOMContentLoaded', async () => {
-    window.location.pathname !== '/unsupported/crypto'
+    let reason = null;
-  ) {
+    if (
-    return window.location.assign('/unsupported/crypto');
+      /firefox/i.test(navigator.userAgent) &&
-  }
+      parseInt(navigator.userAgent.match(/firefox\/*([^\n\r]*)\./i)[1], 10) <=
-  if (capabilities.serviceWorker) {
+        49
-    try {
+    ) {
-      await navigator.serviceWorker.register('/serviceWorker.js');
+      reason = 'outdated';
-      await navigator.serviceWorker.ready;
-    } catch (e) {
-      // continue but disable streaming downloads
-      capabilities.streamDownload = false;
     }
-  }
+    if (/edge\/\d+/i.test(navigator.userAgent)) {
+      reason = 'edge';
+    }
+    const ok = await canHasSend(assets.get('cryptofill.js'));
+    if (!ok) {
+      reason = /firefox/i.test(navigator.userAgent) ? 'outdated' : 'gcm';
+    }
+    if (reason) {
+      setTimeout(() => emitter.emit('replaceState', `/unsupported/${reason}`));
+    }
+  });
+});
 
-  const translate = await getTranslator(locale());
+app.use(metrics);
-  setTranslate(translate);
+app.use(fileManager);
-  // eslint-disable-next-line require-atomic-updates
+app.use(dragManager);
-  window.initialState = {
+app.use(experiments);
-    LIMITS,
-    DEFAULTS,
-    WEB_UI,
-    PREFS,
-    archive: new Archive([], DEFAULTS.EXPIRE_SECONDS, DEFAULTS.DOWNLOADS),
-    capabilities,
-    translate,
-    storage,
-    sentry: Sentry,
-    user: new User(storage, LIMITS, window.AUTH_CONFIG),
-    transfer: null,
-    fileInfo: null,
-    locale: locale()
-  };
 
-  const app = routes(choo({ hash: true }));
+app.mount('body');
-  // eslint-disable-next-line require-atomic-updates
-  window.app = app;
-  app.use(experiments);
-  app.use(controller);
-  app.use(dragManager);
-  app.use(pasteManager);
-  app.mount('body');
-})();

app/metrics.js

@@ -0,0 +1,283 @@
+import testPilotGA from 'testpilot-ga/src/TestPilotGA';
+import storage from './storage';
+
+let hasLocalStorage = false;
+try {
+  hasLocalStorage = typeof localStorage !== 'undefined';
+} catch (e) {
+  // when disabled, any mention of localStorage throws an error
+}
+
+const analytics = new testPilotGA({
+  an: 'Firefox Send',
+  ds: 'web',
+  tid: window.GOOGLE_ANALYTICS_ID
+});
+
+let appState = null;
+let experiment = null;
+
+export default function initialize(state, emitter) {
+  appState = state;
+  emitter.on('DOMContentLoaded', () => {
+    // addExitHandlers();
+    experiment = storage.enrolled[0];
+    sendEvent(category(), 'visit', {
+      cm5: storage.totalUploads,
+      cm6: storage.files.length,
+      cm7: storage.totalDownloads
+    });
+    //TODO restart handlers... somewhere
+  });
+  emitter.on('exit', evt => {
+    exitEvent(evt);
+  });
+}
+
+function category() {
+  switch (appState.route) {
+    case '/':
+    case '/share/:id':
+      return 'sender';
+    case '/download/:id/:key':
+    case '/download/:id':
+    case '/completed':
+      return 'recipient';
+    default:
+      return 'other';
+  }
+}
+
+function sendEvent() {
+  const args = Array.from(arguments);
+  if (experiment && args[2]) {
+    args[2].xid = experiment[0];
+    args[2].xvar = experiment[1];
+  }
+  return (
+    hasLocalStorage && analytics.sendEvent.apply(analytics, args).catch(() => 0)
+  );
+}
+
+function urlToMetric(url) {
+  switch (url) {
+    case 'https://www.mozilla.org/':
+      return 'mozilla';
+    case 'https://www.mozilla.org/about/legal':
+      return 'legal';
+    case 'https://testpilot.firefox.com/about':
+      return 'about';
+    case 'https://testpilot.firefox.com/privacy':
+      return 'privacy';
+    case 'https://testpilot.firefox.com/terms':
+      return 'terms';
+    case 'https://www.mozilla.org/privacy/websites/#cookies':
+      return 'cookies';
+    case 'https://github.com/mozilla/send':
+      return 'github';
+    case 'https://twitter.com/FxTestPilot':
+      return 'twitter';
+    case 'https://www.mozilla.org/firefox/new/?scene=2':
+      return 'download-firefox';
+    case 'https://qsurvey.mozilla.com/s3/txp-firefox-send':
+      return 'survey';
+    case 'https://testpilot.firefox.com/':
+    case 'https://testpilot.firefox.com/experiments/send':
+      return 'testpilot';
+    case 'https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com':
+      return 'promo';
+    default:
+      return 'other';
+  }
+}
+
+function setReferrer(state) {
+  if (category() === 'sender') {
+    if (state) {
+      storage.referrer = `${state}-upload`;
+    }
+  } else if (category() === 'recipient') {
+    if (state) {
+      storage.referrer = `${state}-download`;
+    }
+  }
+}
+
+function externalReferrer() {
+  if (/^https:\/\/testpilot\.firefox\.com/.test(document.referrer)) {
+    return 'testpilot';
+  }
+  return 'external';
+}
+
+function takeReferrer() {
+  const referrer = storage.referrer || externalReferrer();
+  storage.referrer = null;
+  return referrer;
+}
+
+function startedUpload(params) {
+  return sendEvent('sender', 'upload-started', {
+    cm1: params.size,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length + 1,
+    cm7: storage.totalDownloads,
+    cd1: params.type,
+    cd5: takeReferrer()
+  });
+}
+
+function cancelledUpload(params) {
+  setReferrer('cancelled');
+  return sendEvent('sender', 'upload-stopped', {
+    cm1: params.size,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cd1: params.type,
+    cd2: 'cancelled'
+  });
+}
+
+function completedUpload(params) {
+  return sendEvent('sender', 'upload-stopped', {
+    cm1: params.size,
+    cm2: params.time,
+    cm3: params.speed,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cd1: params.type,
+    cd2: 'completed'
+  });
+}
+
+function addedPassword(params) {
+  return sendEvent('sender', 'password-added', {
+    cm1: params.size,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads
+  });
+}
+
+function startedDownload(params) {
+  return sendEvent('recipient', 'download-started', {
+    cm1: params.size,
+    cm4: params.ttl,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads
+  });
+}
+
+function stoppedDownload(params) {
+  return sendEvent('recipient', 'download-stopped', {
+    cm1: params.size,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cd2: 'errored',
+    cd6: params.err
+  });
+}
+
+function cancelledDownload(params) {
+  setReferrer('cancelled');
+  return sendEvent('recipient', 'download-stopped', {
+    cm1: params.size,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cd2: 'cancelled'
+  });
+}
+
+function stoppedUpload(params) {
+  return sendEvent('sender', 'upload-stopped', {
+    cm1: params.size,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cd1: params.type,
+    cd2: 'errored',
+    cd6: params.err
+  });
+}
+
+function completedDownload(params) {
+  return sendEvent('recipient', 'download-stopped', {
+    cm1: params.size,
+    cm2: params.time,
+    cm3: params.speed,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cd2: 'completed'
+  });
+}
+
+function deletedUpload(params) {
+  return sendEvent(category(), 'upload-deleted', {
+    cm1: params.size,
+    cm2: params.time,
+    cm3: params.speed,
+    cm4: params.ttl,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cd1: params.type,
+    cd4: params.location
+  });
+}
+
+function unsupported(params) {
+  return sendEvent(category(), 'unsupported', {
+    cd6: params.err
+  });
+}
+
+function copiedLink(params) {
+  return sendEvent('sender', 'copied', {
+    cd4: params.location
+  });
+}
+
+function exitEvent(target) {
+  return sendEvent(category(), 'exited', {
+    cd3: urlToMetric(target.currentTarget.href)
+  });
+}
+
+// eslint-disable-next-line no-unused-vars
+function addExitHandlers() {
+  const links = Array.from(document.querySelectorAll('a'));
+  links.forEach(l => {
+    if (/^http/.test(l.getAttribute('href'))) {
+      l.addEventListener('click', exitEvent);
+    }
+  });
+}
+
+function restart(state) {
+  setReferrer(state);
+  return sendEvent(category(), 'restarted', {
+    cd2: state
+  });
+}
+
+export {
+  copiedLink,
+  startedUpload,
+  cancelledUpload,
+  stoppedUpload,
+  completedUpload,
+  deletedUpload,
+  startedDownload,
+  cancelledDownload,
+  stoppedDownload,
+  completedDownload,
+  addedPassword,
+  restart,
+  unsupported
+};

app/ownedFile.js

@@ -1,96 +0,0 @@
-import Keychain from './keychain';
-import { arrayToB64 } from './utils';
-import { del, fileInfo, setParams, setPassword } from './api';
-
-export default class OwnedFile {
-  constructor(obj) {
-    if (!obj.manifest) {
-      throw new Error('invalid file object');
-    }
-    this.id = obj.id;
-    this.url = obj.url;
-    this.name = obj.name;
-    this.size = obj.size;
-    this.manifest = obj.manifest;
-    this.time = obj.time;
-    this.speed = obj.speed;
-    this.createdAt = obj.createdAt;
-    this.expiresAt = obj.expiresAt;
-    this.ownerToken = obj.ownerToken;
-    this.dlimit = obj.dlimit || 1;
-    this.dtotal = obj.dtotal || 0;
-    this.keychain = new Keychain(obj.secretKey, obj.nonce);
-    this._hasPassword = !!obj.hasPassword;
-    this.timeLimit = obj.timeLimit;
-  }
-
-  get hasPassword() {
-    return !!this._hasPassword;
-  }
-
-  get expired() {
-    return this.dlimit === this.dtotal || Date.now() > this.expiresAt;
-  }
-
-  async setPassword(password) {
-    try {
-      this.password = password;
-      this._hasPassword = true;
-      this.keychain.setPassword(password, this.url);
-      const result = await setPassword(this.id, this.ownerToken, this.keychain);
-      return result;
-    } catch (e) {
-      this.password = null;
-      this._hasPassword = false;
-      throw e;
-    }
-  }
-
-  del() {
-    return del(this.id, this.ownerToken);
-  }
-
-  changeLimit(dlimit, user = {}) {
-    if (this.dlimit !== dlimit) {
-      this.dlimit = dlimit;
-      return setParams(this.id, this.ownerToken, user.bearerToken, { dlimit });
-    }
-    return Promise.resolve(true);
-  }
-
-  async updateDownloadCount() {
-    const oldTotal = this.dtotal;
-    const oldLimit = this.dlimit;
-    try {
-      const result = await fileInfo(this.id, this.ownerToken);
-      this.dtotal = result.dtotal;
-      this.dlimit = result.dlimit;
-    } catch (e) {
-      if (e.message === '404') {
-        this.dtotal = this.dlimit;
-      }
-      // ignore other errors
-    }
-    return oldTotal !== this.dtotal || oldLimit !== this.dlimit;
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      url: this.url,
-      name: this.name,
-      size: this.size,
-      manifest: this.manifest,
-      time: this.time,
-      speed: this.speed,
-      createdAt: this.createdAt,
-      expiresAt: this.expiresAt,
-      secretKey: arrayToB64(this.keychain.rawSecret),
-      ownerToken: this.ownerToken,
-      dlimit: this.dlimit,
-      dtotal: this.dtotal,
-      hasPassword: this.hasPassword,
-      timeLimit: this.timeLimit
-    };
-  }
-}

app/pasteManager.js

@@ -1,36 +0,0 @@
-function getString(item) {
-  return new Promise(resolve => {
-    item.getAsString(resolve);
-  });
-}
-
-export default function(state, emitter) {
-  window.addEventListener('paste', async event => {
-    if (state.route !== '/' || state.uploading) return;
-    if (['password', 'text', 'email'].includes(event.target.type)) return;
-
-    const items = Array.from(event.clipboardData.items);
-    const transferFiles = items.filter(item => item.kind === 'file');
-    const strings = items.filter(item => item.kind === 'string');
-    if (transferFiles.length) {
-      const promises = transferFiles.map(async (f, i) => {
-        const blob = f.getAsFile();
-        if (!blob) {
-          return null;
-        }
-        const name = await getString(strings[i]);
-        const file = new File([blob], name, { type: blob.type });
-        return file;
-      });
-      const files = (await Promise.all(promises)).filter(f => !!f);
-      if (files.length) {
-        emitter.emit('addFiles', { files });
-      }
-    } else if (strings.length) {
-      strings[0].getAsString(s => {
-        const file = new File([s], 'pasted.txt', { type: 'text/plain' });
-        emitter.emit('addFiles', { files: [file] });
-      });
-    }
-  });
-}

app/readme.md

@@ -1,9 +0,0 @@
-# Application Code
-
-`app/` contains the browser code that gets bundled into `app.[hash].js`. It's got all the logic, crypto, and UI. All of it gets used in the browser, and some of it by the server for server side rendering.
-
-The main entrypoint for the browser is [main.js](./main.js) and on the server [routes.js](./routes.js) is imported by [/server/routes/pages.js](../server/routes/pages.js)
-
-- `pages` contains display logic an markup for pages
-- `routes` contains route definitions and logic
-- `templates` contains ui elements smaller than pages

app/routes.js

@@ -1,21 +0,0 @@
-const choo = require('choo');
-const download = require('./ui/download');
-const body = require('./ui/body');
-
-module.exports = function(app = choo({ hash: true })) {
-  app.route('/', body(require('./ui/home')));
-  app.route('/download/:id', body(download));
-  app.route('/download/:id/:key', body(download));
-  app.route('/unsupported/:reason', body(require('./ui/unsupported')));
-  app.route('/error', body(require('./ui/error')));
-  app.route('/blank', body(require('./ui/blank')));
-  app.route('/oauth', function(state, emit) {
-    emit('authenticate', state.query.code, state.query.state);
-  });
-  app.route('/login', function(state, emit) {
-    emit('replaceState', '/');
-    setTimeout(() => emit('render'));
-  });
-  app.route('*', body(require('./ui/notFound')));
-  return app;
-};

app/routes/download.js

@@ -0,0 +1,12 @@
+const preview = require('../templates/preview');
+const download = require('../templates/download');
+
+module.exports = function(state, emit) {
+  if (state.transfer) {
+    const s = state.transfer.state;
+    if (s === 'downloading' || s === 'complete') {
+      return download(state, emit);
+    }
+  }
+  return preview(state, emit);
+};

app/routes/home.js

@@ -0,0 +1,10 @@
+const welcome = require('../templates/welcome');
+const upload = require('../templates/upload');
+
+module.exports = function(state, emit) {
+  if (state.transfer && state.transfer.iv) {
+    //TODO relying on 'iv' is gross
+    return upload(state, emit);
+  }
+  return welcome(state, emit);
+};

app/routes/index.js

@@ -0,0 +1,43 @@
+const choo = require('choo');
+const html = require('choo/html');
+const download = require('./download');
+const header = require('../templates/header');
+const footer = require('../templates/footer');
+const fxPromo = require('../templates/fxPromo');
+
+const app = choo();
+
+function body(template) {
+  return function(state, emit) {
+    const b = html`<body>
+      ${state.promo === 'header' ? fxPromo(state, emit) : ''}
+      ${header(state)}
+      <div class="all">
+        <noscript>
+          <h2>Firefox Send requires JavaScript</h2>
+          <p><a href="https://github.com/mozilla/send/blob/master/docs/faq.md#why-does-firefox-send-require-javascript">Why does Firefox Send require JavaScript?</a></p>
+          <p>Please enable JavaScript and try again.</p>
+        </noscript>
+        ${template(state, emit)}
+      </div>
+      ${footer(state)}
+    </body>`;
+    if (state.layout) {
+      return state.layout(state, b);
+    }
+    return b;
+  };
+}
+
+app.route('/', body(require('./home')));
+app.route('/share/:id', body(require('../templates/share')));
+app.route('/download/:id', body(download));
+app.route('/download/:id/:key', body(download));
+app.route('/completed', body(require('../templates/completed')));
+app.route('/unsupported/:reason', body(require('../templates/unsupported')));
+app.route('/legal', body(require('../templates/legal')));
+app.route('/error', body(require('../templates/error')));
+app.route('/blank', body(require('../templates/blank')));
+app.route('*', body(require('../templates/notFound')));
+
+module.exports = app;

app/serviceWorker.js

@@ -1,174 +0,0 @@
-import assets from '../common/assets';
-import { version } from '../package.json';
-import Keychain from './keychain';
-import { downloadStream } from './api';
-import { transformStream } from './streams';
-import Zip from './zip';
-import contentDisposition from 'content-disposition';
-
-let noSave = false;
-const map = new Map();
-const IMAGES = /.*\.(png|svg|jpg)$/;
-const VERSIONED_ASSET = /\.[A-Fa-f0-9]{8}\.(js|css|png|svg|jpg)(#\w+)?$/;
-const DOWNLOAD_URL = /\/api\/download\/([A-Fa-f0-9]{4,})/;
-const FONT = /\.woff2?$/;
-
-self.addEventListener('install', () => {
-  self.skipWaiting();
-});
-
-self.addEventListener('activate', event => {
-  event.waitUntil(self.clients.claim().then(precache));
-});
-
-async function decryptStream(id) {
-  const file = map.get(id);
-  if (!file) {
-    return new Response(null, { status: 400 });
-  }
-  try {
-    let size = file.size;
-    let type = file.type;
-    const keychain = new Keychain(file.key, file.nonce);
-    if (file.requiresPassword) {
-      keychain.setPassword(file.password, file.url);
-    }
-
-    file.download = downloadStream(id, keychain);
-
-    const body = await file.download.result;
-
-    const decrypted = keychain.decryptStream(body);
-
-    let zipStream = null;
-    if (file.type === 'send-archive') {
-      const zip = new Zip(file.manifest, decrypted);
-      zipStream = zip.stream;
-      type = 'application/zip';
-      size = zip.size;
-    }
-    const responseStream = transformStream(
-      zipStream || decrypted,
-      {
-        transform(chunk, controller) {
-          file.progress += chunk.length;
-          controller.enqueue(chunk);
-        }
-      },
-      function oncancel() {
-        // NOTE: cancel doesn't currently fire on chrome
-        // https://bugs.chromium.org/p/chromium/issues/detail?id=638494
-        file.download.cancel();
-        map.delete(id);
-      }
-    );
-
-    const headers = {
-      'Content-Disposition': contentDisposition(file.filename),
-      'Content-Type': type,
-      'Content-Length': size
-    };
-    return new Response(responseStream, { headers });
-  } catch (e) {
-    if (noSave) {
-      return new Response(null, { status: e.message });
-    }
-
-    return new Response(null, {
-      status: 302,
-      headers: {
-        Location: `/download/${id}/#${file.key}`
-      }
-    });
-  }
-}
-
-async function precache() {
-  try {
-    await cleanCache();
-    const cache = await caches.open(version);
-    const images = assets.match(IMAGES);
-    await cache.addAll(images);
-  } catch (e) {
-    console.error(e);
-    // cache will get populated on demand
-  }
-}
-
-async function cleanCache() {
-  const oldCaches = await caches.keys();
-  for (const c of oldCaches) {
-    if (c !== version) {
-      await caches.delete(c);
-    }
-  }
-}
-
-function cacheable(url) {
-  return VERSIONED_ASSET.test(url) || FONT.test(url);
-}
-
-async function cachedOrFetched(req) {
-  const cache = await caches.open(version);
-  const cached = await cache.match(req);
-  if (cached) {
-    return cached;
-  }
-  const fetched = await fetch(req);
-  if (fetched.ok && cacheable(req.url)) {
-    cache.put(req, fetched.clone());
-  }
-  return fetched;
-}
-
-self.onfetch = event => {
-  const req = event.request;
-  if (req.method !== 'GET') return;
-  const url = new URL(req.url);
-  const dlmatch = DOWNLOAD_URL.exec(url.pathname);
-  if (dlmatch) {
-    event.respondWith(decryptStream(dlmatch[1]));
-  } else if (cacheable(url.pathname)) {
-    event.respondWith(cachedOrFetched(req));
-  }
-};
-
-self.onmessage = event => {
-  if (event.data.request === 'init') {
-    noSave = event.data.noSave;
-    const info = {
-      key: event.data.key,
-      nonce: event.data.nonce,
-      filename: event.data.filename,
-      requiresPassword: event.data.requiresPassword,
-      password: event.data.password,
-      url: event.data.url,
-      type: event.data.type,
-      manifest: event.data.manifest,
-      size: event.data.size,
-      progress: 0
-    };
-    map.set(event.data.id, info);
-
-    event.ports[0].postMessage('file info received');
-  } else if (event.data.request === 'progress') {
-    const file = map.get(event.data.id);
-    if (!file) {
-      event.ports[0].postMessage({ error: 'cancelled' });
-    } else {
-      if (file.progress === file.size) {
-        map.delete(event.data.id);
-      }
-      event.ports[0].postMessage({ progress: file.progress });
-    }
-  } else if (event.data.request === 'cancel') {
-    const file = map.get(event.data.id);
-    if (file) {
-      if (file.download) {
-        file.download.cancel();
-      }
-      map.delete(event.data.id);
-    }
-    event.ports[0].postMessage('download cancelled');
-  }
-};

app/storage.js

@@ -1,5 +1,4 @@
-import { arrayToB64, isFile } from './utils';
+import { isFile } from './utils';
-import OwnedFile from './ownedFile';
 
 class Mem {
   constructor() {
@@ -38,33 +37,23 @@ class Storage {
   }
 
   loadFiles() {
-    const fs = new Map();
+    const fs = [];
     for (let i = 0; i < this.engine.length; i++) {
       const k = this.engine.key(i);
       if (isFile(k)) {
         try {
-          const f = new OwnedFile(JSON.parse(this.engine.getItem(k)));
+          const f = JSON.parse(this.engine.getItem(k));
           if (!f.id) {
             f.id = f.fileId;
           }
-
+          fs.push(f);
-          fs.set(f.id, f);
         } catch (err) {
           // obviously you're not a golfer
           this.engine.removeItem(k);
         }
       }
     }
-    return fs;
+    return fs.sort((a, b) => a.createdAt - b.createdAt);
-  }
-
-  get id() {
-    let id = this.engine.getItem('device_id');
-    if (!id) {
-      id = arrayToB64(crypto.getRandomValues(new Uint8Array(16)));
-      this.engine.setItem('device_id', id);
-    }
-    return id;
   }
 
   get totalDownloads() {
@@ -86,99 +75,44 @@ class Storage {
     this.engine.setItem('referrer', str);
   }
   get enrolled() {
-    return JSON.parse(this.engine.getItem('ab_experiments') || '{}');
+    return JSON.parse(this.engine.getItem('experiments') || '[]');
   }
 
   enroll(id, variant) {
-    const enrolled = {};
+    const enrolled = this.enrolled;
-    enrolled[id] = variant;
+    // eslint-disable-next-line no-unused-vars
-    this.engine.setItem('ab_experiments', JSON.stringify(enrolled));
+    if (!enrolled.find(([i, v]) => i === id)) {
-  }
+      enrolled.push([id, variant]);
-
+      this.engine.setItem('experiments', JSON.stringify(enrolled));
-  get files() {
-    return Array.from(this._files.values()).sort(
-      (a, b) => a.createdAt - b.createdAt
-    );
-  }
-
-  get user() {
-    try {
-      return JSON.parse(this.engine.getItem('user'));
-    } catch (e) {
-      return null;
     }
   }
 
-  set user(info) {
+  get files() {
-    return this.engine.setItem('user', JSON.stringify(info));
+    return this._files;
   }
 
   getFileById(id) {
-    return this._files.get(id);
+    return this._files.find(f => f.id === id);
   }
 
   get(id) {
     return this.engine.getItem(id);
   }
 
-  set(id, value) {
-    return this.engine.setItem(id, value);
-  }
-
   remove(property) {
     if (isFile(property)) {
-      this._files.delete(property);
+      this._files.splice(this._files.findIndex(f => f.id === property), 1);
     }
     this.engine.removeItem(property);
   }
 
   addFile(file) {
-    this._files.set(file.id, file);
+    this._files.push(file);
-    this.writeFile(file);
-  }
-
-  writeFile(file) {
     this.engine.setItem(file.id, JSON.stringify(file));
   }
 
   writeFiles() {
-    this._files.forEach(f => this.writeFile(f));
+    this._files.forEach(f => this.engine.setItem(f.id, JSON.stringify(f)));
-  }
-
-  clearLocalFiles() {
-    this._files.forEach(f => this.engine.removeItem(f.id));
-    this._files = new Map();
-  }
-
-  async merge(files = []) {
-    let incoming = false;
-    let outgoing = false;
-    let downloadCount = false;
-    for (const f of files) {
-      if (!this.getFileById(f.id)) {
-        this.addFile(new OwnedFile(f));
-        incoming = true;
-      }
-    }
-    const workingFiles = this.files.slice();
-    for (const f of workingFiles) {
-      const cc = await f.updateDownloadCount();
-      if (cc) {
-        await this.writeFile(f);
-      }
-      downloadCount = downloadCount || cc;
-      outgoing = outgoing || f.expired;
-      if (f.expired) {
-        this.remove(f.id);
-      } else if (!files.find(x => x.id === f.id)) {
-        outgoing = true;
-      }
-    }
-    return {
-      incoming,
-      outgoing,
-      downloadCount
-    };
   }
 }
 

app/streams.js

@@ -1,103 +0,0 @@
-/* global TransformStream */
-
-export function transformStream(readable, transformer, oncancel) {
-  try {
-    return readable.pipeThrough(new TransformStream(transformer));
-  } catch (e) {
-    const reader = readable.getReader();
-    return new ReadableStream({
-      start(controller) {
-        if (transformer.start) {
-          return transformer.start(controller);
-        }
-      },
-      async pull(controller) {
-        let enqueued = false;
-        const wrappedController = {
-          enqueue(d) {
-            enqueued = true;
-            controller.enqueue(d);
-          }
-        };
-        while (!enqueued) {
-          const data = await reader.read();
-          if (data.done) {
-            if (transformer.flush) {
-              await transformer.flush(controller);
-            }
-            return controller.close();
-          }
-          await transformer.transform(data.value, wrappedController);
-        }
-      },
-      cancel(reason) {
-        readable.cancel(reason);
-        if (oncancel) {
-          oncancel(reason);
-        }
-      }
-    });
-  }
-}
-
-class BlobStreamController {
-  constructor(blob, size) {
-    this.blob = blob;
-    this.index = 0;
-    this.chunkSize = size || 1024 * 64;
-  }
-
-  pull(controller) {
-    return new Promise((resolve, reject) => {
-      const bytesLeft = this.blob.size - this.index;
-      if (bytesLeft <= 0) {
-        controller.close();
-        return resolve();
-      }
-      const size = Math.min(this.chunkSize, bytesLeft);
-      const slice = this.blob.slice(this.index, this.index + size);
-      const reader = new FileReader();
-      reader.onload = () => {
-        controller.enqueue(new Uint8Array(reader.result));
-        resolve();
-      };
-      reader.onerror = reject;
-      reader.readAsArrayBuffer(slice);
-      this.index += size;
-    });
-  }
-}
-
-export function blobStream(blob, size) {
-  return new ReadableStream(new BlobStreamController(blob, size));
-}
-
-class ConcatStreamController {
-  constructor(streams) {
-    this.streams = streams;
-    this.index = 0;
-    this.reader = null;
-    this.nextReader();
-  }
-
-  nextReader() {
-    const next = this.streams[this.index++];
-    this.reader = next && next.getReader();
-  }
-
-  async pull(controller) {
-    if (!this.reader) {
-      return controller.close();
-    }
-    const data = await this.reader.read();
-    if (data.done) {
-      this.nextReader();
-      return this.pull(controller);
-    }
-    controller.enqueue(data.value);
-  }
-}
-
-export function concatStream(streams) {
-  return new ReadableStream(new ConcatStreamController(streams));
-}

app/templates/blank.js

@@ -0,0 +1,6 @@
+const html = require('choo/html');
+
+module.exports = function() {
+  const div = html`<div id="page-one"></div>`;
+  return div;
+};

app/templates/completed.js

@@ -0,0 +1,35 @@
+const html = require('choo/html');
+const progress = require('./progress');
+const { fadeOut } = require('../utils');
+const fxPromo = require('./fxPromo');
+
+module.exports = function(state, emit) {
+  const div = html`
+  <div id="page-one">
+  <div id="download" class="fadeIn">
+    <div id="download-progress">
+      <div id="dl-title" class="title">${state.translate(
+        'downloadFinish'
+      )}</div>
+      <div class="description"></div>
+      ${progress(1)}
+      <div class="upload">
+        <div class="progress-text"></div>
+      </div>
+    </div>
+    <a class="send-new" data-state="completed" href="/" onclick=${
+      sendNew
+    }>${state.translate('sendYourFilesLink')}</a>
+  </div>
+  ${state.promo === 'body' ? fxPromo(state, emit) : ''}
+  </div>
+  `;
+
+  async function sendNew(e) {
+    e.preventDefault();
+    await fadeOut('download');
+    emit('pushState', '/');
+  }
+
+  return div;
+};

app/templates/download.js

@@ -0,0 +1,32 @@
+const html = require('choo/html');
+const progress = require('./progress');
+const { bytes } = require('../utils');
+const fxPromo = require('./fxPromo');
+
+module.exports = function(state, emit) {
+  const transfer = state.transfer;
+  const div = html`
+  <div id="page-one">
+  <div id="download-progress" class="fadeIn">
+    <div id="dl-title" class="title">${state.translate(
+      'downloadingPageProgress',
+      {
+        filename: state.fileInfo.name,
+        size: bytes(state.fileInfo.size)
+      }
+    )}</div>
+    <div class="description">${state.translate('downloadingPageMessage')}</div>
+    ${progress(transfer.progressRatio)}
+    <div class="upload">
+      <div class="progress-text">${state.translate(
+        transfer.msg,
+        transfer.sizes
+      )}</div>
+    </div>
+    </div>
+    ${state.promo === 'body' ? fxPromo(state, emit) : ''}
+  </div>
+  `;
+
+  return div;
+};

app/templates/downloadPassword.js

@@ -0,0 +1,56 @@
+const html = require('choo/html');
+
+module.exports = function(state, emit) {
+  const fileInfo = state.fileInfo;
+  const label =
+    fileInfo.password === null
+      ? html`
+          <label class="red"
+            for="unlock-input">${state.translate('passwordTryAgain')}</label>`
+      : html`
+          <label for="unlock-input">
+            ${state.translate('unlockInputLabel')}
+          </label>`;
+  const div = html`
+    <div class="enterPassword">
+      ${label}
+      <form id="unlock" onsubmit=${checkPassword} data-no-csrf>
+        <input id="unlock-input"
+          class="unlock-input input-no-btn"
+          maxlength="64"
+          autocomplete="off"
+          placeholder="${state.translate('unlockInputPlaceholder')}"
+          oninput=${inputChanged}
+          type="password"/>
+        <input type="submit"
+          id="unlock-btn"
+          class="btn btn-hidden"
+          value="${state.translate('unlockButtonLabel')}"/>
+      </form>
+    </div>`;
+
+  function inputChanged() {
+    const input = document.getElementById('unlock-input');
+    const btn = document.getElementById('unlock-btn');
+    if (input.value.length > 0) {
+      btn.classList.remove('btn-hidden');
+      input.classList.remove('input-no-btn');
+    } else {
+      btn.classList.add('btn-hidden');
+      input.classList.add('input-no-btn');
+    }
+  }
+
+  function checkPassword(event) {
+    event.preventDefault();
+    const password = document.getElementById('unlock-input').value;
+    if (password.length > 0) {
+      document.getElementById('unlock-btn').disabled = true;
+      state.fileInfo.url = window.location.href;
+      state.fileInfo.password = password;
+      emit('preview');
+    }
+  }
+
+  return div;
+};

app/templates/error.js

@@ -0,0 +1,10 @@
+const html = require('choo/html');
+const assets = require('../../common/assets');
+
+module.exports = function(state) {
+  return html`
+  <div id="upload-error">
+    <div class="title">${state.translate('errorPageHeader')}</div>
+    <img id="upload-error-img" src="${assets.get('illustration_error.svg')}"/>
+  </div>`;
+};

app/templates/file.js

@@ -0,0 +1,84 @@
+const html = require('choo/html');
+const assets = require('../../common/assets');
+
+function timeLeft(milliseconds) {
+  const minutes = Math.floor(milliseconds / 1000 / 60);
+  const hours = Math.floor(minutes / 60);
+  const seconds = Math.floor((milliseconds / 1000) % 60);
+  if (hours >= 1) {
+    return `${hours}h ${minutes % 60}m`;
+  } else if (hours === 0) {
+    return `${minutes}m ${seconds}s`;
+  }
+  return null;
+}
+
+module.exports = function(file, state, emit) {
+  const ttl = file.expiresAt - Date.now();
+  const remaining = timeLeft(ttl) || state.translate('linkExpiredAlt');
+  const row = html`
+  <tr id="${file.id}">
+    <td class="overflow-col" title="${file.name}">${file.name}</td>
+    <td class="center-col">
+      <img onclick=${copyClick} src="${assets.get(
+    'copy-16.svg'
+  )}" class="icon-copy" title="${state.translate('copyUrlHover')}">
+      <span class="text-copied" hidden="true">${state.translate(
+        'copiedUrl'
+      )}</span>
+    </td>
+    <td>${remaining}</td>
+    <td class="center-col">
+      <img onclick=${showPopup} src="${assets.get(
+    'close-16.svg'
+  )}" class="icon-delete" title="${state.translate('deleteButtonHover')}">
+      <div class="popup">
+        <div class="popuptext" onblur=${cancel} tabindex="-1">
+          <div class="popup-message">${state.translate('deletePopupText')}</div>
+          <div class="popup-action">
+            <span class="popup-no" onclick=${cancel}>${state.translate(
+    'deletePopupCancel'
+  )}</span>
+            <span class="popup-yes" onclick=${deleteFile}>${state.translate(
+    'deletePopupYes'
+  )}</span>
+          </div>
+        </div>
+      </div>
+    </td>
+  </tr>
+  `;
+
+  function copyClick(e) {
+    emit('copy', { url: file.url, location: 'upload-list' });
+    const icon = e.target;
+    const text = e.target.nextSibling;
+    icon.hidden = true;
+    text.hidden = false;
+    setTimeout(() => {
+      icon.hidden = false;
+      text.hidden = true;
+    }, 500);
+  }
+
+  function showPopup() {
+    const tr = document.getElementById(file.id);
+    const popup = tr.querySelector('.popuptext');
+    popup.classList.add('show');
+    popup.focus();
+  }
+
+  function cancel(e) {
+    e.stopPropagation();
+    const tr = document.getElementById(file.id);
+    const popup = tr.querySelector('.popuptext');
+    popup.classList.remove('show');
+  }
+
+  function deleteFile() {
+    emit('delete', { file, location: 'upload-list' });
+    emit('render');
+  }
+
+  return row;
+};

app/templates/fileList.js

@@ -0,0 +1,32 @@
+const html = require('choo/html');
+const file = require('./file');
+
+module.exports = function(state, emit) {
+  let table = '';
+  if (state.storage.files.length) {
+    table = html`
+    <table id="uploaded-files">
+      <thead>
+        <tr>
+          <th id="uploaded-file">${state.translate('uploadedFile')}</th>
+          <th id="copy-file-list" class="center-col">${state.translate(
+            'copyFileList'
+          )}</th>
+          <th id="expiry-file-list">${state.translate('expiryFileList')}</th>
+          <th id="delete-file-list" class="center-col">${state.translate(
+            'deleteFileList'
+          )}</th>
+        </tr>
+      </thead>
+      <tbody>
+        ${state.storage.files.map(f => file(f, state, emit))}
+      </tbody>
+    </table>
+    `;
+  }
+  return html`
+  <div id="file-list">
+    ${table}
+  </div>
+  `;
+};

app/templates/footer.js

@@ -0,0 +1,31 @@
+const html = require('choo/html');
+const assets = require('../../common/assets');
+
+module.exports = function(state) {
+  return html`<div class="footer">
+    <div class="legal-links">
+      <a href="https://www.mozilla.org" role="presentation"><img class="mozilla-logo" src="${assets.get(
+        'mozilla-logo.svg'
+      )}" alt="mozilla"/></a>
+      <a href="https://www.mozilla.org/about/legal">${state.translate(
+        'footerLinkLegal'
+      )}</a>
+      <a href="https://testpilot.firefox.com/about">${state.translate(
+        'footerLinkAbout'
+      )}</a>
+      <a href="/legal">${state.translate('footerLinkPrivacy')}</a>
+      <a href="/legal">${state.translate('footerLinkTerms')}</a>
+      <a href="https://www.mozilla.org/privacy/websites/#cookies">${state.translate(
+        'footerLinkCookies'
+      )}</a>
+    </div>
+    <div class="social-links">
+      <a href="https://github.com/mozilla/send" role="presentation"><img class="github" src="${assets.get(
+        'github-icon.svg'
+      )}" alt="github"/></a>
+      <a href="https://twitter.com/FxTestPilot" role="presentation"><img class="twitter" src="${assets.get(
+        'twitter-icon.svg'
+      )}" alt="twitter"/></a>
+    </div>
+  </div>`;
+};

app/templates/fxPromo.js

@@ -0,0 +1,44 @@
+const html = require('choo/html');
+const assets = require('../../common/assets');
+
+// function replaceLinks(str, urls) {
+//   let i = -1;
+//   const s = str.replace(/<a>([^<]+)<\/a>/g, (m, v) => {
+//     i++;
+//     return `<a class="link" href="${urls[i]}">${v}</a>`;
+//   });
+//   return [`<span>${s}</span>`];
+// }
+
+module.exports = function(state, emit) {
+  // function close() {
+  //   document.querySelector('.banner').remove();
+  // }
+
+  function clicked(evt) {
+    emit('exit', evt);
+  }
+
+  return html`
+    <div class="banner">
+      <div>
+        <img
+        src="${assets.get('firefox_logo-only.svg')}"
+        class="firefox-logo-small"
+        alt="Firefox"/>
+        <span>Send is brought to you by the all-new Firefox.
+        <a
+          class="link"
+          href="https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com"
+          onclick=${clicked}
+          >Download Firefox now ≫</a></span>
+      </div>
+    </div>`;
+};
+
+/*
+<img
+  src="${assets.get('close-16.svg')}"
+  class="icon-delete"
+  onclick=${close}>
+*/

app/templates/header.js

@@ -0,0 +1,21 @@
+const html = require('choo/html');
+const assets = require('../../common/assets');
+
+module.exports = function(state) {
+  return html`<header class="header">
+  <div class="send-logo">
+    <a href="/">
+      <img src="${assets.get(
+        'send_logo.svg'
+      )}" alt="Send"/><h1 class="site-title">Send</h1>
+    </a>
+    <div class="site-subtitle">
+      <a href="https://testpilot.firefox.com">Firefox Test Pilot</a>
+      <div>${state.translate('siteSubtitle')}</div>
+    </div>
+  </div>
+  <a href="https://qsurvey.mozilla.com/s3/txp-firefox-send" rel="noreferrer noopener" class="feedback" target="_blank">${state.translate(
+    'siteFeedback'
+  )}</a>
+</header>`;
+};

app/templates/legal.js

@@ -0,0 +1,34 @@
+const html = require('choo/html');
+
+function replaceLinks(str, urls) {
+  let i = -1;
+  const s = str.replace(/<a>([^<]+)<\/a>/g, (m, v) => {
+    i++;
+    return `<a href="${urls[i]}">${v}</a>`;
+  });
+  return [`<div class="description">${s}</div>`];
+}
+
+module.exports = function(state) {
+  const div = html`
+    <div id="page-one">
+      <div id="legal">
+        <div class="title">${state.translate('legalHeader')}</div>
+          ${html(
+            replaceLinks(state.translate('legalNoticeTestPilot'), [
+              'https://testpilot.firefox.com/terms',
+              'https://testpilot.firefox.com/privacy',
+              'https://testpilot.firefox.com/experiments/send'
+            ])
+          )}
+          ${html(
+            replaceLinks(state.translate('legalNoticeMozilla'), [
+              'https://www.mozilla.org/privacy/websites/',
+              'https://www.mozilla.org/about/legal/terms/mozilla/'
+            ])
+          )}
+      </div>
+    </div>
+  `;
+  return div;
+};