From eca962ad68c17a84f6bbd8df9fc92b0581eedc27 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 14 Jun 2019 08:42:46 +0100
Subject: [PATCH 1/9] sdk 0.37.4 update (#579)

* sdk 0.37.4 update
* pin lbry-redux commit hash
* hide save file button
---
 app/package-lock.json     | 32 +++++++++-----------------------
 app/package.json          |  2 +-
 app/src/page/file/view.js |  2 +-
 buildozer.spec.sample     |  2 +-
 buildozer.spec.travis     |  2 +-
 buildozer.spec.vagrant    |  2 +-
 6 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index 4a784489..58b667d0 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -4404,13 +4404,11 @@
                 },
                 "balanced-match": {
                     "version": "1.0.0",
-                    "bundled": true,
-                    "optional": true
+                    "bundled": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
-                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -4423,18 +4421,15 @@
                 },
                 "code-point-at": {
                     "version": "1.1.0",
-                    "bundled": true,
-                    "optional": true
+                    "bundled": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
-                    "bundled": true,
-                    "optional": true
+                    "bundled": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
-                    "bundled": true,
-                    "optional": true
+                    "bundled": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -4537,8 +4532,7 @@
                 },
                 "inherits": {
                     "version": "2.0.3",
-                    "bundled": true,
-                    "optional": true
+                    "bundled": true
                 },
                 "ini": {
                     "version": "1.3.5",
@@ -4548,7 +4542,6 @@
                 "is-fullwidth-code-point": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -4561,20 +4554,17 @@
                 "minimatch": {
                     "version": "3.0.4",
                     "bundled": true,
-                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
                 },
                 "minimist": {
                     "version": "0.0.8",
-                    "bundled": true,
-                    "optional": true
+                    "bundled": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
-                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -4591,7 +4581,6 @@
                 "mkdirp": {
                     "version": "0.5.1",
                     "bundled": true,
-                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -4664,8 +4653,7 @@
                 },
                 "number-is-nan": {
                     "version": "1.0.1",
-                    "bundled": true,
-                    "optional": true
+                    "bundled": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
@@ -4675,7 +4663,6 @@
                 "once": {
                     "version": "1.4.0",
                     "bundled": true,
-                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -4781,7 +4768,6 @@
                 "string-width": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -5567,8 +5553,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#a01b919c72139d82fa981df6be4e0fe902ff8f70",
-            "from": "github:lbryio/lbry-redux",
+            "version": "github:lbryio/lbry-redux#03998a2acf1a9e6c1b0818821612d137b31ebea3",
+            "from": "github:lbryio/lbry-redux#03998a2acf1a9e6c1b0818821612d137b31ebea3",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",
diff --git a/app/package.json b/app/package.json
index 9b07d917..5326fd67 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,7 +10,7 @@
     "dependencies": {
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
-        "lbry-redux": "lbryio/lbry-redux",
+        "lbry-redux": "lbryio/lbry-redux#03998a2acf1a9e6c1b0818821612d137b31ebea3",
         "lbryinc": "lbryio/lbryinc",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js
index 8b8f8200..0d28414e 100644
--- a/app/src/page/file/view.js
+++ b/app/src/page/file/view.js
@@ -865,7 +865,7 @@ class FilePage extends React.PureComponent {
                         />
                       </View>
                       <View style={filePageStyle.subscriptionRow}>
-                        {((isPlayable && !fileInfo) || (isPlayable && fileInfo && !fileInfo.download_path)) && (
+                        {false && ((isPlayable && !fileInfo) || (isPlayable && fileInfo && !fileInfo.download_path)) && (
                           <Button
                             style={[filePageStyle.actionButton, filePageStyle.saveFileButton]}
                             theme={'light'}
diff --git a/buildozer.spec.sample b/buildozer.spec.sample
index 356226f8..3a1f3b3d 100644
--- a/buildozer.spec.sample
+++ b/buildozer.spec.sample
@@ -36,7 +36,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.2#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@397ebe842856a4297bea5281206f9fa40a84699c#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.4#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@v0.5.4a0#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
diff --git a/buildozer.spec.travis b/buildozer.spec.travis
index 356226f8..3a1f3b3d 100644
--- a/buildozer.spec.travis
+++ b/buildozer.spec.travis
@@ -36,7 +36,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.2#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@397ebe842856a4297bea5281206f9fa40a84699c#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.4#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@v0.5.4a0#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
diff --git a/buildozer.spec.vagrant b/buildozer.spec.vagrant
index 356226f8..3a1f3b3d 100644
--- a/buildozer.spec.vagrant
+++ b/buildozer.spec.vagrant
@@ -36,7 +36,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.2#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@397ebe842856a4297bea5281206f9fa40a84699c#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.4#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@v0.5.4a0#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes

From 41c124e042c2b580de7740086b01c5b17173055f Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 14 Jun 2019 08:44:11 +0100
Subject: [PATCH 2/9] bumpversion 0.7.3 --> 0.7.4

---
 src/main/python/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/python/main.py b/src/main/python/main.py
index 1832f6da..0c9f7cbc 100644
--- a/src/main/python/main.py
+++ b/src/main/python/main.py
@@ -1,4 +1,4 @@
-__version__ = "0.7.3"
+__version__ = "0.7.4"
 
 class ServiceApp(App):
     def build(self):

From 9d6cf369d6c41d883b61e0f566adb5ae1b7df6d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?netop=3A//=20=E3=82=A6=E3=82=A7=E3=83=83=E3=83=96?=
 <1288356+NetOperatorWibby@users.noreply.github.com>
Date: Mon, 17 Jun 2019 10:03:02 -0500
Subject: [PATCH 3/9] Added updated Docker instructions (#574)

---
 DOCKER.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 DOCKER.md

diff --git a/DOCKER.md b/DOCKER.md
new file mode 100644
index 00000000..296f6041
--- /dev/null
+++ b/DOCKER.md
@@ -0,0 +1,69 @@
+# Introduction
+The purpose of this guide is to help whomever is interested in running the LBRY Android application from scratch on their device, but they're main computing platform is not Linux but macOS.
+
+## Estimated build time
+25 - 40 minutes (depending on Internet connection speeds)
+
+## What do you need?
+* A computer running the latest OS
+* Internet access to download modules and packages
+* At least 15GB of free disk space
+* Docker
+* Patience
+
+## Step 1/6
+Create an application on [Firebase](https://console.firebase.google.com). In the **Android package name** field, input `io.lbry.browser`. Download the resulting `google-services.json` file and keep it safe, you'll be needing it later.
+
+## Step 2/6
+Start the docker application and paste all of these lines into Terminal:
+
+```bash
+docker run -it lbry/android-base:latest /bin/bash
+wget "https://www.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz" -P ~/.buildozer/android/
+tar -xvf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/
+rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
+ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
+git clone https://github.com/lbryio/lbry-android
+cd lbry-android;cp buildozer.spec.sample buildozer.spec
+cd app;npm i;cd ..
+cp scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
+cp scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
+cd p4a/pythonforandroid/bootstraps/lbry/build/templates
+apt install nano -y
+```
+
+## Step 3/6
+Copy the contents of the `google-services.json` you downloaded earlier and paste them into Terminal after running the next command:
+
+```bash
+nano google-services.json
+```
+
+Type `^X` to save and exit.
+
+## Step 4/6
+Paste more lines and I guess check your email, this will take some time:
+
+```bash
+cd /lbry-android/app
+./bundle.sh
+cd ..
+buildozer android debug
+```
+
+When the build is complete, you should see a message like: `[INFO]:    # APK renamed to browser-0.7.3-debug.apk`. You will need this filename for the next step.
+
+## Step 5/6
+In a separate Terminal window:
+
+```bash
+docker ps # get container name
+docker cp CONTAINER_NAME:/lbry-android/bin/STEP_4_FILENAME ~/Desktop/ # copies STEP_4_FILENAME to your Desktop
+```
+
+## Step 6/6
+- Download [Android File Transfer](https://www.android.com/filetransfer) and install it.
+- On your Android device, install [File Explorer](https://play.google.com/store/apps/details?id=com.mauriciotogneri.fileexplorer).
+- Plug in your Android device and swipe down from the top into the "USB for file transfer" settings (or similar name on your device) and make sure "Transfer files" is selected.
+- Open **Android File Transfer** on your computer and drag and drop `STEP_4_FILENAME` from your Desktop to the `Downloads` folder on the Android device.
+- Back on the Android device, navigate to `STEP_4_FILENAME` in the `Downloads` folder and tap it to begin installation.

From c140aa32b60f62822e656c8b7d1b3f89d2039547 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Mon, 17 Jun 2019 17:13:52 +0100
Subject: [PATCH 4/9] updated Android build instructions

---
 BUILD.md                                      | 52 +++++++++++++------
 QUICKSTART.md                                 |  6 ++-
 .../templates/google-services.sample.json     | 40 ++++++++++++++
 3 files changed, 79 insertions(+), 19 deletions(-)
 create mode 100644 p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.sample.json

diff --git a/BUILD.md b/BUILD.md
index b0201ea1..26954f8a 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -1,6 +1,8 @@
 ## Linux Build Instructions
 
-This app has currently only been built on Ubuntu 14.04, 16.04, 17.10, and 18.04, but these instructions, or an analog of them, should work on most Linux or macOS environments.
+This app has currently only been built on Ubuntu 14.04, 16.04, 17.10, and 18.04, but these instructions, or an analog of them, should work on most Linux or macOS environments. An abridged version of these instructions is available at [QUICKSTART.md](QUICKSTART.md).
+
+For instructions on how to build using a Docker image, please see [DOCKER.md](DOCKER.md).
 
 ### Install Prerequisites
 
@@ -14,25 +16,31 @@ This app has currently only been built on Ubuntu 14.04, 16.04, 17.10, and 18.04,
 * yarn
 
 #### apt Packages
-Based on the quick-start instructions at http://buildozer.readthedocs.io/en/latest/installation.html
+Install all apt packages required by running the following commands:
 ```
 sudo dpkg --add-architecture i386
-sudo apt-get update
-sudo apt-get install autoconf autogen build-essential curl libtool libffi-dev python python-pip python-openssl python3.7 python3.7-dev python3-pip ccache git libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386
+sudo apt-get -y update
+sudo apt-get install -y curl ca-certificates software-properties-common gpg-agent wget
+sudo add-apt-repository ppa:deadsnakes/ppa -y && \
+     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo apt-get -y update && apt-get -y install autoconf autogen automake libtool libffi-dev \
+     build-essential python3.7 python3.7-dev python3.7-venv python3-pip ccache git libncurses5:i386 libstdc++6:i386 \
+     libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
+     python-pip openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 yarn gawk nodejs npm
 ```
 Alternatively, the JDK available from http://www.oracle.com/technetwork/java/javase/downloads/index.html can be installed instead of the `openjdk-8-jdk` package.
 
 #### Install Cython and Setuptools
 ```
-sudo pip install --upgrade cython==0.28.1 setuptools
+sudo -H pip install --upgrade cython==0.28.1 setuptools
 ```
 
 #### Install buildozer
 A forked version of `buildozer` needs to be installed in order to copy the React Native UI source files into the corresponding directories.
 ```
 git clone https://github.com/lbryio/buildozer.git
-cd buildozer
-sudo python2.7 setup.py install
+cd buildozer && python2.7 setup.py install && cd ..
 ```
 
 #### Create buildozer.spec
@@ -59,11 +67,18 @@ Assuming `lbry-android` as the current working folder:
 | p4a.source_dir      | Path to the python-for-android repository folder. Currently set to the included `p4a` folder |
 | p4a.local_recipes   | Path to a folder containing python_for_android recipes to be used in the build. The included `recipes` folder includes recipes for a successful build |
 
+#### Create google-services.json
+The `google-services.json` file is required for the build to be successful due to the Firebase implementation. Simply copy the provided sample file into the same destination folder.
+```
+cd lbry-android
+cp p4a/pythonforandroid/bootstraps/lbry/templates/google-services.sample.json p4a/pythonforandroid/bootstraps/lbry/templates/google-services.json
+```
+
 #### Setup Android SDK for buildozer
 Download the Android SDK, platform and build tools archives.
 * Android API 23 SDK - https://dl.google.com/android/android-sdk_r23-linux.tgz
-* Android API 27 platform - https://dl.google.com/android/repository/platform-27_r01.zip
-* Android build tools 26.0.1 - https://dl.google.com/android/repository/build-tools_r26.0.1-linux.
+* Android API 28 platform - https://dl.google.com/android/repository/platform-28_r06.zip
+* Android build tools 26.0.2 - https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip
 
 Create the `.buildozer` path (and the `android` sub-path) in your home folder if it doesn't already exist.
 `mkdir ~/.buildozer`
@@ -75,17 +90,17 @@ tar -xf android-sdk_r23-linux.tgz ~/.buildozer/android/platform/
 mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk-23
 ```
 
-Extract the API 27 platform archive into the `android-sdk-23` folder and rename the extracted folder.
+Extract the API 28 platform archive into the `android-sdk-23` folder and rename the extracted folder.
 ```
-unzip platform-27_r01.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms
-mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-8.1.0 ~/.buildozer/android/platform/android-sdk-23/platforms/android-27
+unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms
+mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-9 ~/.buildozer/android/platform/android-sdk-23/platforms/android-2
 ```
 
-Extract the build tools 26.0.1 build tools into the `android-sdk-23` folder and rename the extracted folder.
+Extract the build tools 26.0.2 build tools into the `android-sdk-23` folder and rename the extracted folder.
 ```
 mkdir -p ~/.buildozer/android/platform/android-sdk-23/build-tools
-unzip ~/.buildozer/android/platform/build-tools_r26.0.1-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools
-mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-8.0.0 ~/.buildozer/android/platform/android-sdk-23/build-tools/26.0.1
+unzip ~/.buildozer/android/platform/build-tools_r26.0.2-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools
+mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-8.1.0 ~/.buildozer/android/platform/android-sdk-23/build-tools/26.0.2
 ```
 
 Finally, create the Android SDK license file. This prevents being prompted to accept the SDK license during the build process.
@@ -97,14 +112,17 @@ echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platfo
 #### Setup Crystax Android NDK for buildozer
 * Download the Crystax Android NDK from https://us.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz and extract. Remember to update `android.ndk_path` in your `buildozer.spec` to the path of the extracted Crystax NDK archive.
 * Copy `build-target-python.sh` from the `scripts` folder in the cloned `lbry-android` repository to the `crystax-ndk-10.3.2/build/tools/` folder.
+* Copy `mangled-glibc-syscalls.h` from the `scripts` folder in the cloned `lbry-android` repository to the `crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/` folder.
 * Delete the `android-9` folder in `crystax-ndk-10.3.2/platforms`, and create a symbolic link named `android-9` to the `android-21` folder.
 
 #### Build and Deploy
-Run `npm i` in the `lbry-android/app` folder to install the necessary modules required by the React Native user interface.
+Run `npm install -g react-native-cli` to install React Native CLI tools.
+
+Run `npm i` in the `lbry-android/app` folder to install the necessary modules required by the React Native user interface, and then run `./bundle.sh`.
 
 Run `./build.sh` in `lbry-android` to build the APK. The output can be found in the `bin` subdirectory.
 
-To build and deploy, you can run `./deploy.sh`. This requires a connected device or running Android emulator.
+To build and deploy, you can run `./deploy.sh`. This requires a connected device or a running Android emulator.
 
 #### Development
 If you already installed `Android SDK` and `adb`
diff --git a/QUICKSTART.md b/QUICKSTART.md
index f5753a1c..99e8b8c2 100644
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -72,18 +72,20 @@ wget 'https://www.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -
 ```
 
 ### Step 7 of 10
-Clone the lbryio/lbry-android git repository and create your buildozer.spec file. The provide buildozer.spec.sample contains defaults provided you followed steps 1 through 5 exactly as described. You can also customise the spec file if you want to.
+Clone the lbryio/lbry-android git repository and create your `buildozer.spec` and `google-services.json` files. The provided `buildozer.spec.sample` contains defaults provided you followed steps 1 through 5 exactly as described. You can also customise the spec file if you want to. The `google-services.sample.json` can be used to ensure the build completes successfully.
 ```
 git clone https://github.com/lbryio/lbry-android
 cd lbry-android
 cp buildozer.spec.sample buildozer.spec
+cp p4a/pythonforandroid/bootstraps/lbry/templates/google-services.sample.json p4a/pythonforandroid/bootstraps/lbry/templates/google-services.json
 ```
 
 ### Step 8 of 10
-Install the npm packages required for the app's React Native code.
+Install the npm packages required for the app's React Native code, and create the React Native app bundle.
 ```
 cd app
 npm install
+./bundle.sh
 cd ..
 ```
 
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.sample.json b/p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.sample.json
new file mode 100644
index 00000000..4780d388
--- /dev/null
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.sample.json
@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "861521963586",
+    "firebase_url": "https://lbry-mobile-builds-debug.firebaseio.com",
+    "project_id": "lbry-mobile-builds-debug",
+    "storage_bucket": "lbry-mobile-builds-debug.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:861521963586:android:592958d248940ab2",
+        "android_client_info": {
+          "package_name": "io.lbry.browser"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "861521963586-60cmvg5nmnrqkrc11a7bpmpv5ra2d50q.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC7A3BYcIdZP9-Q-VNHoexYJWgZA7WzsPI"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "861521963586-60cmvg5nmnrqkrc11a7bpmpv5ra2d50q.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file

From ea60df592f1164b5d41b39983fc285d953e1bb5f Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 21 Jun 2019 08:21:14 +0100
Subject: [PATCH 5/9] additional events to track first run flow

---
 .../firstRun/internal/email-collect-page.js   |  2 +-
 .../firstRun/internal/email-verify-page.js    |  2 +-
 app/src/page/firstRun/view.js                 | 30 ++++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/src/page/firstRun/internal/email-collect-page.js b/app/src/page/firstRun/internal/email-collect-page.js
index b420b496..04bb651c 100644
--- a/app/src/page/firstRun/internal/email-collect-page.js
+++ b/app/src/page/firstRun/internal/email-collect-page.js
@@ -43,7 +43,7 @@ class EmailCollectPage extends React.PureComponent {
     const { onEmailViewLayout } = this.props;
 
     const content = (
-      <View onLayout={onEmailViewLayout}>
+      <View onLayout={() => onEmailViewLayout('collect')}>
         <Text style={firstRunStyle.title}>Setup account</Text>
         <TextInput
           style={firstRunStyle.emailInput}
diff --git a/app/src/page/firstRun/internal/email-verify-page.js b/app/src/page/firstRun/internal/email-verify-page.js
index e0229ecb..64f24ca6 100644
--- a/app/src/page/firstRun/internal/email-verify-page.js
+++ b/app/src/page/firstRun/internal/email-verify-page.js
@@ -20,7 +20,7 @@ class EmailVerifyPage extends React.PureComponent {
     const { onEmailViewLayout, email } = this.props;
 
     const content = (
-      <View onLayout={onEmailViewLayout}>
+      <View onLayout={() => onEmailViewLayout('verify')}>
         <Text style={firstRunStyle.title}>Verify Email</Text>
         <Text style={firstRunStyle.paragraph}>
           An email has been sent to{' '}
diff --git a/app/src/page/firstRun/view.js b/app/src/page/firstRun/view.js
index 4958dc61..1d7a1da3 100644
--- a/app/src/page/firstRun/view.js
+++ b/app/src/page/firstRun/view.js
@@ -24,7 +24,9 @@ class FirstRunScreen extends React.PureComponent {
   state = {
     currentPage: null,
     email: null,
+    emailCollectTracked: false,
     emailSubmitted: false,
+    enterPasswordTracked: false,
     isFirstRun: false,
     launchUrl: null,
     showSkip: false,
@@ -32,7 +34,7 @@ class FirstRunScreen extends React.PureComponent {
     skipAccountConfirmed: false,
     showBottomContainer: false,
     walletPassword: null,
-    syncApplyStarted: false,
+    syncApplyStarted: false
   };
 
   componentDidMount() {
@@ -44,7 +46,10 @@ class FirstRunScreen extends React.PureComponent {
 
     if (NativeModules.FirstRun) {
       NativeModules.FirstRun.isFirstRun().then(firstRun => {
+        AsyncStorage.removeItem(Constants.KEY_FIRST_RUN_EMAIL);
+        AsyncStorage.removeItem(Constants.KEY_EMAIL_VERIFY_PENDING);
         this.setState({ isFirstRun: firstRun });
+
         if (firstRun) {
           this.setState({ currentPage: FirstRunScreen.pages[0] });
         } else {
@@ -118,6 +123,7 @@ class FirstRunScreen extends React.PureComponent {
   handleLeftButtonPressed = () => {
     // Go to setup account page when "Setup account" is pressed
     if (Constants.FIRST_RUN_PAGE_SKIP_ACCOUNT === this.state.currentPage) {
+      this.setState({ emailCollectTracked: false }); // reset tracked flag
       return this.showPage(Constants.FIRST_RUN_PAGE_EMAIL_COLLECT);
     }
 
@@ -128,6 +134,7 @@ class FirstRunScreen extends React.PureComponent {
 
     // Go to email collection page if user cancels from email verification
     if (Constants.FIRST_RUN_PAGE_EMAIL_VERIFY === this.state.currentPage) {
+      this.setState({ emailCollectTracked: false }); // reset tracked flag
       this.showPage(Constants.FIRST_RUN_PAGE_EMAIL_COLLECT);
     }
   };
@@ -228,10 +235,17 @@ class FirstRunScreen extends React.PureComponent {
     }
   };
 
-  onEmailViewLayout = () => {
+  onEmailViewLayout = (phase) => {
+    if ('collect' === phase) {
+      if (!this.state.emailCollectTracked) {
+        // we only want to track this once
+        this.setState({ emailCollectTracked: true }, () => NativeModules.Firebase.track('first_run_email_collect', null));
+      }
+    } else if ('verify' === phase) {
+      NativeModules.Firebase.track('first_run_email_verify', null);
+    }
+
     this.setState({ showBottomContainer: true, showSkip: true });
-    AsyncStorage.removeItem(Constants.KEY_FIRST_RUN_EMAIL);
-    AsyncStorage.removeItem(Constants.KEY_EMAIL_VERIFY_PENDING);
   };
 
   onWalletPasswordChanged = password => {
@@ -239,6 +253,9 @@ class FirstRunScreen extends React.PureComponent {
   };
 
   onWalletViewLayout = () => {
+    if (!this.state.enterPasswordTracked) {
+      this.setState({ enterPasswordTracked: true }, () => NativeModules.Firebase.track('first_run_enter_password', null));
+    }
     this.setState({ showBottomContainer: true });
   };
 
@@ -246,6 +263,11 @@ class FirstRunScreen extends React.PureComponent {
     this.setState({ showBottomContainer: true });
   };
 
+  onSkipAccountViewLayout = () => {
+    NativeModules.Firebase.track('first_run_skip_account', null);
+    this.setState({ showBottomContainer: true });
+  };
+
   onSkipSwitchChanged = checked => {
     this.setState({ skipAccountConfirmed: checked });
   };

From dd9677ea3b6701bd3c84fb8a6b3c2980ae61f666 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 21 Jun 2019 09:46:27 +0100
Subject: [PATCH 6/9] add paste button beside wallet address input

---
 app/src/component/button/index.js    |  5 +----
 app/src/component/button/view.js     |  4 ++--
 app/src/component/walletSend/view.js | 14 +++++++++++---
 app/src/page/file/view.js            | 17 +++++++++--------
 app/src/page/wallet/view.js          |  6 +++++-
 app/src/styles/wallet.js             |  1 +
 6 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/app/src/component/button/index.js b/app/src/component/button/index.js
index ae02c0c7..b6a77e57 100644
--- a/app/src/component/button/index.js
+++ b/app/src/component/button/index.js
@@ -1,7 +1,4 @@
 import { connect } from 'react-redux';
 import Button from './view';
 
-export default connect(
-  null,
-  null
-)(Button);
+export default connect()(Button);
diff --git a/app/src/component/button/view.js b/app/src/component/button/view.js
index 1e9e993e..3fdc26f8 100644
--- a/app/src/component/button/view.js
+++ b/app/src/component/button/view.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text, TouchableOpacity } from 'react-native';
-import buttonStyle from '../../styles/button';
-import Colors from '../../styles/colors';
+import buttonStyle from 'styles/button';
+import Colors from 'styles/colors';
 import Icon from 'react-native-vector-icons/FontAwesome5';
 
 export default class Button extends React.PureComponent {
diff --git a/app/src/component/walletSend/view.js b/app/src/component/walletSend/view.js
index 428f9b13..f1d33ae0 100644
--- a/app/src/component/walletSend/view.js
+++ b/app/src/component/walletSend/view.js
@@ -1,9 +1,10 @@
 // @flow
 import React from 'react';
 import { regexAddress } from 'lbry-redux';
-import { Alert, TextInput, Text, View } from 'react-native';
-import Button from '../button';
-import walletStyle from '../../styles/wallet';
+import { Alert, Clipboard, TextInput, Text, View } from 'react-native';
+import Button from 'component/button';
+import Colors from 'styles/colors';
+import walletStyle from 'styles/wallet';
 
 type DraftTransaction = {
   address: string,
@@ -99,10 +100,16 @@ class WalletSend extends React.PureComponent<Props> {
             onBlur={this.handleAddressInputBlur}
             onSubmitEditing={this.handleAddressInputSubmit}
             placeholder={'bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs'}
+            underlineColorAndroid={Colors.NextLbryGreen}
             value={this.state.address}
             returnKeyType={'next'}
             style={[walletStyle.input, walletStyle.addressInput, walletStyle.bottomMarginMedium]}
           />
+          <Button
+            icon={'paste'}
+            style={walletStyle.button}
+            onPress={() => Clipboard.getString().then(value => this.setState({ address: value, addressChanged: true }))}
+          />
         </View>
         <Text style={walletStyle.text}>Amount</Text>
         <View style={walletStyle.row}>
@@ -112,6 +119,7 @@ class WalletSend extends React.PureComponent<Props> {
               onChangeText={value => this.setState({ amount: value })}
               keyboardType={'numeric'}
               placeholder={'0'}
+              underlineColorAndroid={Colors.NextLbryGreen}
               value={this.state.amount}
               style={[walletStyle.input, walletStyle.amountInput]}
             />
diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js
index 0d28414e..cc1e34a2 100644
--- a/app/src/page/file/view.js
+++ b/app/src/page/file/view.js
@@ -865,14 +865,15 @@ class FilePage extends React.PureComponent {
                         />
                       </View>
                       <View style={filePageStyle.subscriptionRow}>
-                        {false && ((isPlayable && !fileInfo) || (isPlayable && fileInfo && !fileInfo.download_path)) && (
-                          <Button
-                            style={[filePageStyle.actionButton, filePageStyle.saveFileButton]}
-                            theme={'light'}
-                            icon={'download'}
-                            onPress={this.onSaveFilePressed}
-                          />
-                        )}
+                        {false &&
+                          ((isPlayable && !fileInfo) || (isPlayable && fileInfo && !fileInfo.download_path)) && (
+                            <Button
+                              style={[filePageStyle.actionButton, filePageStyle.saveFileButton]}
+                              theme={'light'}
+                              icon={'download'}
+                              onPress={this.onSaveFilePressed}
+                            />
+                          )}
                         <Button
                           style={[filePageStyle.actionButton, filePageStyle.tipButton]}
                           theme={'light'}
diff --git a/app/src/page/wallet/view.js b/app/src/page/wallet/view.js
index 824ee2de..7f33622a 100644
--- a/app/src/page/wallet/view.js
+++ b/app/src/page/wallet/view.js
@@ -101,7 +101,11 @@ class WalletPage extends React.PureComponent {
     return (
       <View style={walletStyle.container}>
         <UriBar navigation={navigation} />
-        <ScrollView style={walletStyle.scrollContainer} keyboardShouldPersistTaps={'handled'}>
+        <ScrollView
+          style={walletStyle.scrollContainer}
+          keyboardShouldPersistTaps={'handled'}
+          removeClippedSubviews={false}
+        >
           <WalletSyncDriver navigation={navigation} />
           {!rewardsNotInterested && (!balance || balance === 0) && <WalletRewardsDriver navigation={navigation} />}
           <WalletBalance />
diff --git a/app/src/styles/wallet.js b/app/src/styles/wallet.js
index d6450061..8a0c4fc9 100644
--- a/app/src/styles/wallet.js
+++ b/app/src/styles/wallet.js
@@ -138,6 +138,7 @@ const walletStyle = StyleSheet.create({
     flex: 1,
     fontSize: 16,
     letterSpacing: 1.5,
+    marginRight: 8,
   },
   warning: {
     backgroundColor: Colors.Orange,

From 945308dfbce6335800c45198ed971f56b0db0fcc Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 21 Jun 2019 10:19:25 +0100
Subject: [PATCH 7/9] formatting

---
 app/src/page/firstRun/view.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/page/firstRun/view.js b/app/src/page/firstRun/view.js
index 1d7a1da3..816c6af1 100644
--- a/app/src/page/firstRun/view.js
+++ b/app/src/page/firstRun/view.js
@@ -34,7 +34,7 @@ class FirstRunScreen extends React.PureComponent {
     skipAccountConfirmed: false,
     showBottomContainer: false,
     walletPassword: null,
-    syncApplyStarted: false
+    syncApplyStarted: false,
   };
 
   componentDidMount() {
@@ -235,11 +235,13 @@ class FirstRunScreen extends React.PureComponent {
     }
   };
 
-  onEmailViewLayout = (phase) => {
+  onEmailViewLayout = phase => {
     if ('collect' === phase) {
       if (!this.state.emailCollectTracked) {
         // we only want to track this once
-        this.setState({ emailCollectTracked: true }, () => NativeModules.Firebase.track('first_run_email_collect', null));
+        this.setState({ emailCollectTracked: true }, () =>
+          NativeModules.Firebase.track('first_run_email_collect', null)
+        );
       }
     } else if ('verify' === phase) {
       NativeModules.Firebase.track('first_run_email_verify', null);
@@ -254,7 +256,9 @@ class FirstRunScreen extends React.PureComponent {
 
   onWalletViewLayout = () => {
     if (!this.state.enterPasswordTracked) {
-      this.setState({ enterPasswordTracked: true }, () => NativeModules.Firebase.track('first_run_enter_password', null));
+      this.setState({ enterPasswordTracked: true }, () =>
+        NativeModules.Firebase.track('first_run_enter_password', null)
+      );
     }
     this.setState({ showBottomContainer: true });
   };

From 0a210b6e0928831420550abb04275354f4bb73ca Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 21 Jun 2019 10:20:44 +0100
Subject: [PATCH 8/9] bumpversion 0.7.4 --> 0.7.5

---
 src/main/python/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/python/main.py b/src/main/python/main.py
index 0c9f7cbc..131b42b4 100644
--- a/src/main/python/main.py
+++ b/src/main/python/main.py
@@ -1,4 +1,4 @@
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 
 class ServiceApp(App):
     def build(self):

From fdac63a299826933ae6368973da21111371aec12 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 21 Jun 2019 17:14:32 +0100
Subject: [PATCH 9/9] increase status call timeout to 1000ms

---
 app/src/page/splash/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/page/splash/view.js b/app/src/page/splash/view.js
index c9e4bbf9..b4ae47e5 100644
--- a/app/src/page/splash/view.js
+++ b/app/src/page/splash/view.js
@@ -214,7 +214,7 @@ class SplashScreen extends React.PureComponent {
 
     setTimeout(() => {
       this.updateStatus();
-    }, 500);
+    }, 1000);
   }
 
   componentDidMount() {