From 75586ec4e5261c86f54ff5d0a9a1f823e6a5f7ec Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@ivt.com.au>
Date: Tue, 20 May 2014 06:13:15 +0930
Subject: [PATCH] Moved ApkDownloader to .net package

This is where it belongs, along with the other downloader code.
---
 src/org/fdroid/fdroid/AppDetails.java              |  1 +
 src/org/fdroid/fdroid/{ => net}/ApkDownloader.java | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename src/org/fdroid/fdroid/{ => net}/ApkDownloader.java (96%)

diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 3baf3c3b8..0281ab08e 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -68,6 +68,7 @@ import org.fdroid.fdroid.data.*;
 import org.fdroid.fdroid.installer.Installer;
 import org.fdroid.fdroid.installer.Installer.AndroidNotCompatibleException;
 import org.fdroid.fdroid.installer.Installer.InstallerCallback;
+import org.fdroid.fdroid.net.ApkDownloader;
 import org.fdroid.fdroid.net.Downloader;
 import org.xml.sax.XMLReader;
 
diff --git a/src/org/fdroid/fdroid/ApkDownloader.java b/src/org/fdroid/fdroid/net/ApkDownloader.java
similarity index 96%
rename from src/org/fdroid/fdroid/ApkDownloader.java
rename to src/org/fdroid/fdroid/net/ApkDownloader.java
index 07c34f5d5..c2f4aa475 100644
--- a/src/org/fdroid/fdroid/ApkDownloader.java
+++ b/src/org/fdroid/fdroid/net/ApkDownloader.java
@@ -18,15 +18,13 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.net;
 
 import android.os.Bundle;
 import android.util.Log;
-
+import org.fdroid.fdroid.Hasher;
+import org.fdroid.fdroid.ProgressListener;
 import org.fdroid.fdroid.data.Apk;
-import org.fdroid.fdroid.net.AsyncDownloadWrapper;
-import org.fdroid.fdroid.net.Downloader;
-import org.fdroid.fdroid.net.HttpDownloader;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,7 +33,7 @@ import java.security.NoSuchAlgorithmException;
 
 public class ApkDownloader implements AsyncDownloadWrapper.Listener {
 
-    private static final String TAG = "org.fdroid.fdroid.ApkDownloader";
+    private static final String TAG = "org.fdroid.fdroid.net.ApkDownloader";
 
     public static final String EVENT_APK_DOWNLOAD_COMPLETE = "apkDownloadComplete";
     public static final String EVENT_APK_DOWNLOAD_CANCELLED = "apkDownloadCancelled";