Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make DownloaderService use urlString var names like rest of code

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-08-08 14:04:31 +02:00
parent 20a1b4c83d
commit e02a5987d2
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
View File

@ -271,29 +271,31 @@ public class DownloaderService extends Service {
/** /**
* Add a URL to the download queue. * Add a URL to the download queue.
* <p/> * <p>
* All notifications are sent as an {@link Intent} via local broadcasts to be received by * All notifications are sent as an {@link Intent} via local broadcasts to be received by
* *
* @param context this app's {@link Context} * @param context this app's {@link Context}
* @param urlString The URL to add to the download queue * @param mirrorUrlString The URL to add to the download queue
* @param repoId the database ID number representing one repo
* @param urlString the URL used as the unique ID throughout F-Droid
* @see #cancel(Context, String) * @see #cancel(Context, String)
*/ */
public static void queue(Context context, String urlString, long repoId, String originalUrlString) { public static void queue(Context context, String mirrorUrlString, long repoId, String urlString) {
if (TextUtils.isEmpty(urlString)) { if (TextUtils.isEmpty(mirrorUrlString)) {
return; return;
} }
Utils.debugLog(TAG, "Preparing " + urlString + " to go into the download queue"); Utils.debugLog(TAG, "Preparing " + mirrorUrlString + " to go into the download queue");
Intent intent = new Intent(context, DownloaderService.class); Intent intent = new Intent(context, DownloaderService.class);
intent.setAction(ACTION_QUEUE); intent.setAction(ACTION_QUEUE);
intent.setData(Uri.parse(urlString)); intent.setData(Uri.parse(mirrorUrlString));
intent.putExtra(Downloader.EXTRA_REPO_ID, repoId); intent.putExtra(Downloader.EXTRA_REPO_ID, repoId);
intent.putExtra(Downloader.EXTRA_CANONICAL_URL, originalUrlString); intent.putExtra(Downloader.EXTRA_CANONICAL_URL, urlString);
context.startService(intent); context.startService(intent);
} }
/** /**
* Remove a URL to the download queue, even if it is currently downloading. * Remove a URL to the download queue, even if it is currently downloading.
* <p/> * <p>
* All notifications are sent as an {@link Intent} via local broadcasts to be received by * All notifications are sent as an {@link Intent} via local broadcasts to be received by
* *
* @param context this app's {@link Context} * @param context this app's {@link Context}