diff --git a/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java index 42d9c0ef6..0fa6811b6 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java @@ -51,7 +51,6 @@ public class ApkDownloader implements AsyncDownloader.Listener { private static final String TAG = "ApkDownloader"; public static final String EVENT_APK_DOWNLOAD_COMPLETE = "apkDownloadComplete"; - public static final String EVENT_APK_DOWNLOAD_CANCELLED = "apkDownloadCancelled"; public static final String EVENT_ERROR = "apkDownloadError"; public static final String ACTION_STATUS = "apkDownloadStatus"; @@ -257,11 +256,6 @@ public class ApkDownloader implements AsyncDownloader.Listener { prepareApkFileAndSendCompleteMessage(); } - @Override - public void onDownloadCancelled() { - sendMessage(EVENT_APK_DOWNLOAD_CANCELLED); - } - @Override public void onProgress(Event event) { sendProgressEvent(event); diff --git a/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloadWrapper.java b/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloadWrapper.java index 84618bb7f..ff559e201 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloadWrapper.java +++ b/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloadWrapper.java @@ -12,7 +12,6 @@ class AsyncDownloadWrapper extends Handler implements AsyncDownloader { private static final String TAG = "AsyncDownloadWrapper"; private static final int MSG_DOWNLOAD_COMPLETE = 2; - private static final int MSG_DOWNLOAD_CANCELLED = 3; private static final int MSG_ERROR = 4; private static final String MSG_DATA = "data"; @@ -61,9 +60,6 @@ class AsyncDownloadWrapper extends Handler implements AsyncDownloader { case MSG_DOWNLOAD_COMPLETE: listener.onDownloadComplete(); break; - case MSG_DOWNLOAD_CANCELLED: - listener.onDownloadCancelled(); - break; case MSG_ERROR: listener.onErrorDownloading(message.getData().getString(MSG_DATA)); break; @@ -77,7 +73,7 @@ class AsyncDownloadWrapper extends Handler implements AsyncDownloader { downloader.download(); sendMessage(MSG_DOWNLOAD_COMPLETE); } catch (InterruptedException e) { - sendMessage(MSG_DOWNLOAD_CANCELLED); + // ignored } catch (IOException e) { Log.e(TAG, "I/O exception in download thread", e); Bundle data = new Bundle(1); diff --git a/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloader.java index d0cfc77a4..0c70895f9 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloader.java @@ -8,8 +8,6 @@ public interface AsyncDownloader { void onErrorDownloading(String localisedExceptionDetails); void onDownloadComplete(); - - void onDownloadCancelled(); } int getBytesRead(); diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index b5f8ed5c0..a3b521f21 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -789,8 +789,6 @@ public class SwapWorkflowActivity extends AppCompatActivity { case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE: handleDownloadComplete(downloader.localFile(), app.packageName); break; - case ApkDownloader.EVENT_ERROR: - break; } } });