From 13e54ced07b0a0ca0654adcf35b9e40ece741104 Mon Sep 17 00:00:00 2001 From: Toby Kurien Date: Sat, 5 Sep 2015 10:02:42 +0200 Subject: [PATCH] Display of app name and version in the download title --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 2 +- F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index ed42c392a..945fbbd14 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -884,7 +884,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A } private void startDownload(Apk apk, String repoAddress) { - downloadHandler = new ApkDownloader(getBaseContext(), apk, repoAddress); + downloadHandler = new ApkDownloader(getBaseContext(), app, apk, repoAddress); localBroadcastManager.registerReceiver(downloaderProgressReceiver, new IntentFilter(Downloader.LOCAL_ACTION_PROGRESS)); downloadHandler.setProgressListener(this); diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java index f8de9a802..7b1192497 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java @@ -34,6 +34,7 @@ import org.fdroid.fdroid.ProgressListener; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.compat.FileCompat; import org.fdroid.fdroid.data.Apk; +import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.SanitizedFile; import java.io.File; @@ -69,6 +70,7 @@ public class ApkDownloader implements AsyncDownloadWrapper.Listener { */ public static final String EVENT_DATA_ERROR_TYPE = "apkDownloadErrorType"; + @NonNull private final App app; @NonNull private final Apk curApk; @NonNull private final Context context; @NonNull private final String repoAddress; @@ -89,8 +91,9 @@ public class ApkDownloader implements AsyncDownloadWrapper.Listener { setProgressListener(null); } - public ApkDownloader(@NonNull final Context context, @NonNull final Apk apk, @NonNull final String repoAddress) { + public ApkDownloader(@NonNull final Context context, @NonNull final App app, @NonNull final Apk apk, @NonNull final String repoAddress) { this.context = context; + this.app = app; curApk = apk; this.repoAddress = repoAddress; localFile = new SanitizedFile(Utils.getApkDownloadDir(context), apk.apkName); @@ -197,7 +200,9 @@ public class ApkDownloader implements AsyncDownloadWrapper.Listener { if (canUseDownloadManager(new URL(remoteAddress))) { // If we can use Android's DownloadManager, let's use it, because // of better OS integration, reliability, and async ability - dlWrapper = new AsyncDownloader(context, this, curApk.apkName, curApk.id, remoteAddress, localFile); + dlWrapper = new AsyncDownloader(context, this, + app.name + " " + curApk.version, curApk.id, + remoteAddress, localFile); } else { Downloader downloader = DownloaderFactory.create(context, remoteAddress, localFile); dlWrapper = new AsyncDownloadWrapper(downloader, this);