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

.Downloader --> .ApkDownloader to distinguish from .net.Downloader

Browse Source 
org.fdroid.froid.Downloader is only used for downloading APKs, so name it
appropriately.

refs #2598 https://dev.guardianproject.info/issues/2598
This commit is contained in:
Hans-Christoph Steiner 2014-02-24 19:54:57 -05:00 committed by Peter Serwylo
parent 2c80f1a758
commit c4b0eb9b51
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/fdroid/fdroid/Downloader.java → src/org/fdroid/fdroid/ApkDownloader.java
View File

@ -29,7 +29,7 @@ import java.net.URL;
import android.util.Log; import android.util.Log;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
public class Downloader extends Thread { public class ApkDownloader extends Thread {
private Apk curapk; private Apk curapk;
private String repoaddress; private String repoaddress;
@ -53,7 +53,7 @@ public class Downloader extends Thread {
// Constructor - creates a Downloader to download the given Apk, // Constructor - creates a Downloader to download the given Apk,
// which must have its detail populated. // which must have its detail populated.
Downloader(Apk apk, String repoaddress, File destdir) { ApkDownloader(Apk apk, String repoaddress, File destdir) {
curapk = apk; curapk = apk;
this.repoaddress = repoaddress; this.repoaddress = repoaddress;
this.destdir = destdir; this.destdir = destdir;

6
src/org/fdroid/fdroid/AppDetails.java
View File

@ -1072,14 +1072,14 @@ public class AppDetails extends ListActivity {
// Handler used to update the progress dialog while downloading. // Handler used to update the progress dialog while downloading.
private class DownloadHandler extends Handler { private class DownloadHandler extends Handler {
private Downloader download; private ApkDownloader download;
private ProgressDialog pd; private ProgressDialog pd;
private boolean updating; private boolean updating;
private String id; private String id;
public DownloadHandler(Apk apk, String repoaddress, File destdir) { public DownloadHandler(Apk apk, String repoaddress, File destdir) {
id = apk.id; id = apk.id;
download = new Downloader(apk, repoaddress, destdir); download = new ApkDownloader(apk, repoaddress, destdir);
download.start(); download.start();
startUpdates(); startUpdates();
} }
@ -1106,7 +1106,7 @@ public class AppDetails extends ListActivity {
if (pd != null) if (pd != null)
pd.dismiss(); pd.dismiss();
String text; String text;
if (download.getErrorType() == Downloader.Error.CORRUPT) if (download.getErrorType() == ApkDownloader.Error.CORRUPT)
text = getString(R.string.corrupt_download); text = getString(R.string.corrupt_download);
else else
text = download.getErrorMessage(); text = download.getErrorMessage();