From ab709e171a7fb1c6c77712c0a8c2bbebe3a12d6b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 29 Mar 2016 11:56:17 +0200 Subject: [PATCH] remove ApkDownloader.EXTRA_TYPE, it is entirely unused This constant is wired up, but ultimately does nothing at all, since all of the cases in the switch do the exact same thing. --- .../java/org/fdroid/fdroid/net/ApkDownloader.java | 2 -- .../org/fdroid/fdroid/views/swap/SwapAppsView.java | 14 ++------------ 2 files changed, 2 insertions(+), 14 deletions(-) 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 c179c0025..42d9c0ef6 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java @@ -55,7 +55,6 @@ public class ApkDownloader implements AsyncDownloader.Listener { public static final String EVENT_ERROR = "apkDownloadError"; public static final String ACTION_STATUS = "apkDownloadStatus"; - public static final String EXTRA_TYPE = "apkDownloadStatusType"; public static final String EXTRA_URL = "apkDownloadUrl"; public static final int ERROR_HASH_MISMATCH = 101; @@ -227,7 +226,6 @@ public class ApkDownloader implements AsyncDownloader.Listener { Intent intent = new Intent(ACTION_STATUS); intent.putExtras(event.getData()); - intent.putExtra(EXTRA_TYPE, event.type); intent.putExtra(EXTRA_URL, Utils.getApkUrl(repoAddress, curApk)); LocalBroadcastManager.getInstance(context).sendBroadcast(intent); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java index 2598c76a2..664884a20 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java @@ -279,18 +279,8 @@ public class SwapAppsView extends ListView implements // apkToInstall. This way, we can wait until we receive an incoming intent (if // at all) and then lazily load the apk to install. String broadcastUrl = intent.getStringExtra(ApkDownloader.EXTRA_URL); - if (!TextUtils.equals(Utils.getApkUrl(apk.repoAddress, apk), broadcastUrl)) { - return; - } - - switch (intent.getStringExtra(ApkDownloader.EXTRA_TYPE)) { - // Fallthrough for each of these "downloader no longer going" events... - case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE: - case ApkDownloader.EVENT_APK_DOWNLOAD_CANCELLED: - case ApkDownloader.EVENT_ERROR: - case ApkDownloader.EVENT_DATA_ERROR_TYPE: - resetView(); - break; + if (TextUtils.equals(Utils.getApkUrl(apk.repoAddress, apk), broadcastUrl)) { + resetView(); } } };