From c4b0eb9b510feb9b6ff4484c313dac67ab5311f6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 24 Feb 2014 19:54:57 -0500
Subject: [PATCH] .Downloader --> .ApkDownloader to distinguish from
 .net.Downloader

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

refs #2598 https://dev.guardianproject.info/issues/2598
---
 .../fdroid/fdroid/{Downloader.java => ApkDownloader.java}   | 4 ++--
 src/org/fdroid/fdroid/AppDetails.java                       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/org/fdroid/fdroid/{Downloader.java => ApkDownloader.java} (98%)

diff --git a/src/org/fdroid/fdroid/Downloader.java b/src/org/fdroid/fdroid/ApkDownloader.java
similarity index 98%
rename from src/org/fdroid/fdroid/Downloader.java
rename to src/org/fdroid/fdroid/ApkDownloader.java
index 22bcac17e..0e99249b6 100644
--- a/src/org/fdroid/fdroid/Downloader.java
+++ b/src/org/fdroid/fdroid/ApkDownloader.java
@@ -29,7 +29,7 @@ import java.net.URL;
 import android.util.Log;
 import org.fdroid.fdroid.data.Apk;
 
-public class Downloader extends Thread {
+public class ApkDownloader extends Thread {
 
     private Apk curapk;
     private String repoaddress;
@@ -53,7 +53,7 @@ public class Downloader extends Thread {
 
     // Constructor - creates a Downloader to download the given Apk,
     // which must have its detail populated.
-    Downloader(Apk apk, String repoaddress, File destdir) {
+    ApkDownloader(Apk apk, String repoaddress, File destdir) {
         curapk = apk;
         this.repoaddress = repoaddress;
         this.destdir = destdir;
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 96e82b6bf..7638242b5 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -1072,14 +1072,14 @@ public class AppDetails extends ListActivity {
 
     // Handler used to update the progress dialog while downloading.
     private class DownloadHandler extends Handler {
-        private Downloader download;
+        private ApkDownloader download;
         private ProgressDialog pd;
         private boolean updating;
         private String id;
 
         public DownloadHandler(Apk apk, String repoaddress, File destdir) {
             id = apk.id;
-            download = new Downloader(apk, repoaddress, destdir);
+            download = new ApkDownloader(apk, repoaddress, destdir);
             download.start();
             startUpdates();
         }
@@ -1106,7 +1106,7 @@ public class AppDetails extends ListActivity {
                 if (pd != null)
                     pd.dismiss();
                 String text;
-                if (download.getErrorType() == Downloader.Error.CORRUPT)
+                if (download.getErrorType() == ApkDownloader.Error.CORRUPT)
                     text = getString(R.string.corrupt_download);
                 else
                     text = download.getErrorMessage();