From 425a83faec1476ada58c0513074a7f9fda4bb524 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 23 Oct 2018 15:53:08 +0100
Subject: [PATCH] Improved stop download handling (#342)

---
 app/src/redux/actions/file.js                               | 6 +++++-
 .../bootstraps/lbry/build/templates/build.tmpl.gradle       | 6 ------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/redux/actions/file.js b/app/src/redux/actions/file.js
index 892adf01..2caf274b 100644
--- a/app/src/redux/actions/file.js
+++ b/app/src/redux/actions/file.js
@@ -30,6 +30,10 @@ export function doUpdateLoadStatus(uri, outpoint) {
       full_status: true,
     }).then(([fileInfo]) => {
       if (!fileInfo || fileInfo.written_bytes === 0) {
+        // if the outpoint isn't in the state, then it was probably canceled, so stop checking the load status
+        const { downloadingByOutpoint = {} } = state.fileInfo;
+        if (!downloadingByOutpoint[outpoint]) return;
+
         // download hasn't started yet
         setTimeout(() => {
           dispatch(doUpdateLoadStatus(uri, outpoint));
@@ -133,7 +137,7 @@ export function doStopDownloadingFile(uri, fileInfo) {
     Lbry.file_set_status(params).then(() => {
       dispatch({
         type: ACTIONS.DOWNLOADING_CANCELED,
-        data: {}
+        data: { uri, outpoint: fileInfo.outpoint }
       });
 
       // Should also delete the file after the user stops downloading
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
index e718a8c7..5d8b782c 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
@@ -1,9 +1,3 @@
-// This depends on the openjdk-8-jdk package (Ubuntu) being installed
-compileJava {
-    options.fork = true
-    options.forkOptions.executable = /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
-}
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {