From ae5fb8e8fc656bcd31691b2d9800d24e40a59f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 2 Jan 2016 18:47:59 +0100
Subject: [PATCH] Run Studio's imports optimizer

---
 F-Droid/src/org/fdroid/fdroid/AppDetails.java                 | 2 +-
 F-Droid/src/org/fdroid/fdroid/FDroidApp.java                  | 2 +-
 F-Droid/src/org/fdroid/fdroid/data/Repo.java                  | 2 +-
 F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java          | 2 +-
 F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java      | 2 +-
 F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java         | 3 ++-
 .../src/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java  | 4 +++-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 4bdc1621f..ab9b4dc65 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -84,6 +84,7 @@ import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.ApkProvider;
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.AppProvider;
+import org.fdroid.fdroid.data.Credentials;
 import org.fdroid.fdroid.data.InstalledAppProvider;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
@@ -97,7 +98,6 @@ import org.fdroid.fdroid.net.Downloader;
 import java.io.File;
 import java.util.Iterator;
 import java.util.List;
-import org.fdroid.fdroid.data.Credentials;
 
 interface AppDetailsData {
     App getApp();
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index 5e6b856ef..89389e45e 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -43,10 +43,10 @@ import com.nostra13.universalimageloader.cache.disc.naming.FileNameGenerator;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.utils.StorageUtils;
+
 import org.acra.ACRA;
 import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
-
 import org.apache.commons.net.util.SubnetUtils;
 import org.fdroid.fdroid.Preferences.ChangeListener;
 import org.fdroid.fdroid.compat.PRNGFixes;
diff --git a/F-Droid/src/org/fdroid/fdroid/data/Repo.java b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
index abe4509b0..abbbf791a 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/Repo.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
@@ -5,11 +5,11 @@ import android.database.Cursor;
 import android.text.TextUtils;
 
 import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.net.auth.HttpBasicCredentials;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Date;
-import org.fdroid.fdroid.net.auth.HttpBasicCredentials;
 
 public class Repo extends ValueObject {
 
diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
index 83e2cc98e..7698c2ccd 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
@@ -34,12 +34,12 @@ 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.Credentials;
 import org.fdroid.fdroid.data.SanitizedFile;
 
 import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
-import org.fdroid.fdroid.data.Credentials;
 
 /**
  * Downloads and verifies (against the Apk.hash) the apk file.
diff --git a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java b/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java
index 3fbd81ff1..c62106db9 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java
@@ -7,11 +7,11 @@ import android.database.Cursor;
 import android.os.Build;
 
 import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.data.Credentials;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import org.fdroid.fdroid.data.Credentials;
 
 public class DownloaderFactory {
 
diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
index a3520adaf..2057758ea 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
@@ -2,11 +2,13 @@ package org.fdroid.fdroid.net;
 
 import android.content.Context;
 import android.util.Log;
+
 import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
 
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.data.Credentials;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -21,7 +23,6 @@ import java.net.SocketAddress;
 import java.net.URL;
 
 import javax.net.ssl.SSLHandshakeException;
-import org.fdroid.fdroid.data.Credentials;
 
 public class HttpDownloader extends Downloader {
     private static final String TAG = "HttpDownloader";
diff --git a/F-Droid/src/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java b/F-Droid/src/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java
index 84117616e..6557b26c8 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java
@@ -20,10 +20,12 @@
 package org.fdroid.fdroid.net.auth;
 
 import android.text.TextUtils;
-import java.net.HttpURLConnection;
+
 import org.apache.commons.net.util.Base64;
 import org.fdroid.fdroid.data.Credentials;
 
+import java.net.HttpURLConnection;
+
 /**
  * Credentials implementation for HTTP Basic Authentication.
  */