From 0f18a0979d58e7207e492a9401290a43620b80c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Apr 2015 11:58:22 +0200 Subject: [PATCH] Run Android Studio's import optimizer * Remove all wildcard imports * Reorder alphabetically and by source * Remove unused imports --- .../fdroid/fdroid/CompatibilityChecker.java | 7 +++++- F-Droid/src/org/fdroid/fdroid/FDroid.java | 1 + F-Droid/src/org/fdroid/fdroid/FDroidApp.java | 2 ++ .../src/org/fdroid/fdroid/FDroidCertPins.java | 2 +- F-Droid/src/org/fdroid/fdroid/Hasher.java | 2 +- .../src/org/fdroid/fdroid/SearchResults.java | 1 + F-Droid/src/org/fdroid/fdroid/Utils.java | 2 ++ .../org/fdroid/fdroid/compat/FileCompat.java | 1 + .../fdroid/compat/PackageManagerCompat.java | 2 -- .../org/fdroid/fdroid/compat/TabManager.java | 1 + F-Droid/src/org/fdroid/fdroid/data/Apk.java | 1 + .../org/fdroid/fdroid/data/ApkProvider.java | 5 +++- F-Droid/src/org/fdroid/fdroid/data/App.java | 2 +- .../org/fdroid/fdroid/data/AppProvider.java | 10 ++++---- .../fdroid/fdroid/data/FDroidProvider.java | 9 +++++-- .../org/fdroid/fdroid/data/NewRepoConfig.java | 1 + F-Droid/src/org/fdroid/fdroid/data/Repo.java | 1 + .../org/fdroid/fdroid/data/RepoProvider.java | 1 + .../org/fdroid/fdroid/data/ValueObject.java | 1 + .../fdroid/installer/CheckRootAsyncTask.java | 7 +++--- .../fdroid/installer/DefaultInstaller.java | 6 ++--- .../installer/DefaultInstallerSdk14.java | 6 ++--- .../fdroid/fdroid/installer/Installer.java | 10 ++++---- .../fdroid/installer/RootInstaller.java | 3 ++- .../fdroid/installer/SystemInstaller.java | 8 +++---- .../fdroid/localrepo/LocalRepoKeyStore.java | 24 ++++++++++++++++--- .../fdroid/localrepo/LocalRepoService.java | 6 +++-- .../fdroid/net/AsyncDownloadWrapper.java | 1 + .../src/org/fdroid/fdroid/net/LocalHTTPD.java | 18 ++++++++++---- .../src/org/fdroid/fdroid/net/MDnsHelper.java | 5 +++- .../fdroid/receiver/PackageAddedReceiver.java | 1 + .../fdroid/receiver/PackageReceiver.java | 1 + .../receiver/PackageRemovedReceiver.java | 1 + .../fdroid/updater/SignedRepoUpdater.java | 7 +++++- .../fdroid/updater/UnsignedRepoUpdater.java | 1 + .../fdroid/views/LocalRepoActivity.java | 2 -- .../views/QrWizardDownloadActivity.java | 6 ++++- .../views/QrWizardWifiNetworkActivity.java | 1 + .../org/fdroid/fdroid/views/RepoAdapter.java | 4 ++-- .../fdroid/views/RepoDetailsActivity.java | 1 + .../fragments/AvailableAppsFragment.java | 1 + .../fragments/InstalledAppsFragment.java | 1 + .../views/fragments/PreferencesFragment.java | 3 +-- .../views/fragments/RepoDetailsFragment.java | 1 + .../fragments/SearchResultsFragment.java | 1 + .../fragments/ThemeableListFragment.java | 1 + .../swap/ConfirmReceiveSwapFragment.java | 1 + .../fdroid/views/swap/JoinWifiFragment.java | 1 + .../fdroid/views/swap/NfcSwapFragment.java | 1 + .../fdroid/views/swap/SelectAppsFragment.java | 15 ++++++++++-- .../fdroid/views/swap/StartSwapFragment.java | 1 + .../fdroid/views/swap/SwapActivity.java | 3 ++- .../views/swap/SwapAppListActivity.java | 2 +- .../fdroid/views/swap/WifiQrFragment.java | 2 ++ .../test/ProviderTestCase2MockContext.java | 4 ++-- .../test/src/mock/MockCategoryResources.java | 4 ++-- .../mock/MockContextSwappableComponents.java | 3 ++- .../test/src/mock/MockFDroidResources.java | 6 ++--- .../fdroid/fdroid/ApkProviderHelperTest.java | 1 + .../org/fdroid/fdroid/ApkProviderTest.java | 1 - .../org/fdroid/fdroid/AppProviderTest.java | 8 +++---- .../fdroid/fdroid/BaseApkProviderTest.java | 1 + .../org/fdroid/fdroid/FDroidProviderTest.java | 12 ++++++---- .../src/org/fdroid/fdroid/FileCompatTest.java | 1 + .../fdroid/fdroid/InstalledAppCacheTest.java | 4 ++-- .../fdroid/InstalledAppProviderTest.java | 7 ++++-- .../org/fdroid/fdroid/SanitizedFileTest.java | 1 + .../test/src/org/fdroid/fdroid/TestUtils.java | 17 +++++++++---- .../fdroid/compat/FileCompatForTest.java | 7 +----- 69 files changed, 196 insertions(+), 86 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java index 3fe12d251..f73948ab7 100644 --- a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java +++ b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java @@ -6,11 +6,16 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.preference.PreferenceManager; import android.util.Log; + import org.fdroid.fdroid.compat.Compatibility; import org.fdroid.fdroid.compat.SupportedArchitectures; import org.fdroid.fdroid.data.Apk; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; // Call getIncompatibleReasons(apk) on an instance of this class to // find reasons why an apk may be incompatible with the user's device. diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java index 5e2a84f1b..dcfb37012 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroid.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java @@ -42,6 +42,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; import android.widget.Toast; + import org.fdroid.fdroid.compat.TabManager; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.NewRepoConfig; diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java index 0aa8c379b..5e1194cad 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java @@ -40,11 +40,13 @@ import android.os.Messenger; import android.os.RemoteException; import android.preference.PreferenceManager; import android.widget.Toast; + import com.nostra13.universalimageloader.cache.disc.impl.LimitedAgeDiscCache; 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.fdroid.fdroid.Preferences.ChangeListener; import org.fdroid.fdroid.compat.PRNGFixes; import org.fdroid.fdroid.data.AppProvider; diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java index 21de7f090..3dd07c670 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java @@ -18,9 +18,9 @@ package org.fdroid.fdroid; -import java.util.List; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; public class FDroidCertPins { public static final String[] DEFAULT_PINS = { diff --git a/F-Droid/src/org/fdroid/fdroid/Hasher.java b/F-Droid/src/org/fdroid/fdroid/Hasher.java index 8f456fb9b..b028cf91e 100644 --- a/F-Droid/src/org/fdroid/fdroid/Hasher.java +++ b/F-Droid/src/org/fdroid/fdroid/Hasher.java @@ -20,8 +20,8 @@ package org.fdroid.fdroid; -import java.io.File; import java.io.BufferedInputStream; +import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.security.MessageDigest; diff --git a/F-Droid/src/org/fdroid/fdroid/SearchResults.java b/F-Droid/src/org/fdroid/fdroid/SearchResults.java index 9f3bf0cff..9c287ff00 100644 --- a/F-Droid/src/org/fdroid/fdroid/SearchResults.java +++ b/F-Droid/src/org/fdroid/fdroid/SearchResults.java @@ -28,6 +28,7 @@ import android.support.v7.app.ActionBarActivity; import android.view.Menu; import android.view.MenuItem; import android.widget.LinearLayout; + import org.fdroid.fdroid.views.fragments.SearchResultsFragment; public class SearchResults extends ActionBarActivity { diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java index 2c1d6cd28..6988e7123 100644 --- a/F-Droid/src/org/fdroid/fdroid/Utils.java +++ b/F-Droid/src/org/fdroid/fdroid/Utils.java @@ -30,7 +30,9 @@ import android.text.Html; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; + import com.nostra13.universalimageloader.utils.StorageUtils; + import org.fdroid.fdroid.compat.FileCompat; import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.SanitizedFile; diff --git a/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java index f00c0f9dc..58954a673 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java @@ -4,6 +4,7 @@ import android.annotation.TargetApi; import android.os.Build; import android.system.ErrnoException; import android.util.Log; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.SanitizedFile; diff --git a/F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java index 8bdc00628..d1647ffbd 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java @@ -1,7 +1,5 @@ package org.fdroid.fdroid.compat; -import java.lang.Exception; - import android.annotation.TargetApi; import android.content.pm.PackageManager; import android.util.Log; diff --git a/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java b/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java index b8d074839..03a415662 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java @@ -7,6 +7,7 @@ import android.support.v7.app.ActionBar; import android.view.View; import android.view.ViewGroup; import android.widget.Spinner; + import org.fdroid.fdroid.FDroid; import java.util.ArrayList; diff --git a/F-Droid/src/org/fdroid/fdroid/data/Apk.java b/F-Droid/src/org/fdroid/fdroid/data/Apk.java index 9010d3f14..7cc6b0b9a 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/Apk.java +++ b/F-Droid/src/org/fdroid/fdroid/data/Apk.java @@ -2,6 +2,7 @@ package org.fdroid.fdroid.data; import android.content.ContentValues; import android.database.Cursor; + import org.fdroid.fdroid.Utils; import java.util.Date; diff --git a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java index 1e0924868..aab5c581c 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java @@ -9,7 +9,10 @@ import android.net.Uri; import android.provider.BaseColumns; import android.util.Log; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class ApkProvider extends FDroidProvider { diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java index afa1d414d..b0e05e384 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/App.java +++ b/F-Droid/src/org/fdroid/fdroid/data/App.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.jar.JarEntry; diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index 0905f7129..d719820ea 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -1,13 +1,17 @@ package org.fdroid.fdroid.data; -import android.content.Context; import android.content.ContentResolver; import android.content.ContentValues; +import android.content.Context; import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; import android.util.Log; +import org.fdroid.fdroid.Preferences; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.Utils; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -15,10 +19,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.fdroid.fdroid.Preferences; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.Utils; - public class AppProvider extends FDroidProvider { private static final String TAG = "fdroid.AppProvider"; diff --git a/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java b/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java index 5ab5ebdf7..60cae9d2a 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java @@ -1,15 +1,20 @@ package org.fdroid.fdroid.data; import android.annotation.TargetApi; -import android.content.*; +import android.content.ContentProvider; +import android.content.ContentProviderOperation; +import android.content.ContentProviderResult; +import android.content.ContentValues; +import android.content.OperationApplicationException; +import android.content.UriMatcher; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.os.Build; import java.util.ArrayList; import java.util.HashSet; -import java.util.Set; import java.util.Map; +import java.util.Set; public abstract class FDroidProvider extends ContentProvider { diff --git a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java index d8f70d221..6e41123ed 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java +++ b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.net.Uri; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.R; import java.util.Arrays; diff --git a/F-Droid/src/org/fdroid/fdroid/data/Repo.java b/F-Droid/src/org/fdroid/fdroid/data/Repo.java index 56663117a..5b8cd1cdc 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/Repo.java +++ b/F-Droid/src/org/fdroid/fdroid/data/Repo.java @@ -4,6 +4,7 @@ import android.content.ContentValues; import android.database.Cursor; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.Utils; import java.net.MalformedURLException; diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java index a2f5bd2aa..aae150721 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java @@ -10,6 +10,7 @@ import android.net.Uri; import android.provider.BaseColumns; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Utils; diff --git a/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java b/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java index e37fb6f6c..925ebfda8 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java +++ b/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java @@ -2,6 +2,7 @@ package org.fdroid.fdroid.data; import android.database.Cursor; import android.util.Log; + import org.fdroid.fdroid.Utils; import java.text.ParseException; diff --git a/F-Droid/src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java b/F-Droid/src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java index 9e44fc7e8..8c12268cd 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java @@ -19,13 +19,14 @@ package org.fdroid.fdroid.installer; -import org.fdroid.fdroid.R; - -import eu.chainfire.libsuperuser.Shell; import android.app.ProgressDialog; import android.content.Context; import android.os.AsyncTask; +import org.fdroid.fdroid.R; + +import eu.chainfire.libsuperuser.Shell; + public class CheckRootAsyncTask extends AsyncTask { ProgressDialog mDialog; final Context mContext; diff --git a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java index d5535f33d..bd7eaa4c3 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java @@ -19,9 +19,6 @@ package org.fdroid.fdroid.installer; -import java.io.File; -import java.util.List; - import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -29,6 +26,9 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; +import java.io.File; +import java.util.List; + /** * For Android < 4: Default Installer using the public PackageManager API of * Android to install/delete packages. This starts a Activity from the Android diff --git a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java index c6b4200e7..2c4b4a85c 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java @@ -19,9 +19,6 @@ package org.fdroid.fdroid.installer; -import java.io.File; -import java.util.List; - import android.annotation.TargetApi; import android.app.Activity; import android.content.ActivityNotFoundException; @@ -31,6 +28,9 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; +import java.io.File; +import java.util.List; + /** * For Android >= 4.0: Default Installer using the public PackageManager API of * Android to install/delete packages. This starts a Activity from the Android diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java index c49cdc0f7..87083ec1d 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java @@ -19,11 +19,6 @@ package org.fdroid.fdroid.installer; -import java.io.File; -import java.util.List; - -import org.fdroid.fdroid.Preferences; - import android.Manifest.permission; import android.app.Activity; import android.content.Context; @@ -31,6 +26,11 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.util.Log; +import org.fdroid.fdroid.Preferences; + +import java.io.File; +import java.util.List; + /** * Abstract Installer class. Also provides static methods to automatically * instantiate a working Installer based on F-Droids granted permissions. diff --git a/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java index fbcec2cdc..931366716 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.util.Log; -import eu.chainfire.libsuperuser.Shell; import java.io.File; import java.util.ArrayList; @@ -31,6 +30,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import eu.chainfire.libsuperuser.Shell; + /** * Installer using a root shell and "pm install", "pm uninstall" commands */ diff --git a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java index cd0e8ad7a..cd58fcd82 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java @@ -19,10 +19,6 @@ package org.fdroid.fdroid.installer; -import java.io.File; -import java.lang.reflect.Method; -import java.util.List; - import android.content.Context; import android.content.Intent; import android.content.pm.IPackageDeleteObserver; @@ -32,6 +28,10 @@ import android.net.Uri; import android.os.RemoteException; import android.util.Log; +import java.io.File; +import java.lang.reflect.Method; +import java.util.List; + /** * Installer based on using internal hidden APIs of the Android OS, which are * protected by the permissions diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java index d2acff4e6..1f6b61895 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java @@ -6,7 +6,10 @@ import android.util.Log; import org.fdroid.fdroid.FDroidApp; import org.spongycastle.asn1.ASN1Sequence; import org.spongycastle.asn1.x500.X500Name; -import org.spongycastle.asn1.x509.*; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.asn1.x509.X509Extension; import org.spongycastle.cert.X509CertificateHolder; import org.spongycastle.cert.X509v3CertificateBuilder; import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; @@ -14,10 +17,25 @@ import org.spongycastle.operator.ContentSigner; import org.spongycastle.operator.OperatorCreationException; import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; import java.math.BigInteger; import java.net.Socket; -import java.security.*; +import java.security.GeneralSecurityException; +import java.security.Key; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.UnrecoverableKeyException; import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java index 3b99c4290..3e10860f1 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java @@ -18,6 +18,7 @@ import android.os.Messenger; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; import android.util.Log; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences.ChangeListener; @@ -27,13 +28,14 @@ import org.fdroid.fdroid.net.LocalHTTPD; import org.fdroid.fdroid.net.WifiStateChangeService; import org.fdroid.fdroid.views.swap.SwapActivity; -import javax.jmdns.JmDNS; -import javax.jmdns.ServiceInfo; import java.io.IOException; import java.net.BindException; import java.util.HashMap; import java.util.Random; +import javax.jmdns.JmDNS; +import javax.jmdns.ServiceInfo; + public class LocalRepoService extends Service { private static final String TAG = "fdroid.LocalRepoService"; diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java index e87f9f129..a311721b9 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java +++ b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.util.Log; + import org.fdroid.fdroid.ProgressListener; import java.io.IOException; diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java index 729cad0be..193f3625e 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java @@ -4,17 +4,27 @@ import android.content.Context; import android.util.Log; import android.webkit.MimeTypeMap; -import fi.iki.elonen.NanoHTTPD; - import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.localrepo.LocalRepoKeyStore; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; import javax.net.ssl.SSLServerSocketFactory; +import fi.iki.elonen.NanoHTTPD; + public class LocalHTTPD extends NanoHTTPD { private static final String TAG = "fdroid.LocalHTTPD"; diff --git a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java index 27641094e..cdd3e59b6 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java +++ b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java @@ -21,7 +21,10 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.List; -import javax.jmdns.*; +import javax.jmdns.JmDNS; +import javax.jmdns.ServiceEvent; +import javax.jmdns.ServiceInfo; +import javax.jmdns.ServiceListener; public class MDnsHelper implements ServiceListener { diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java index 44024f3ae..575ae10d8 100644 --- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java +++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.content.pm.PackageInfo; import android.net.Uri; import android.util.Log; + import org.fdroid.fdroid.data.InstalledAppProvider; public class PackageAddedReceiver extends PackageReceiver { diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java index 9c972a540..b5e6fab14 100644 --- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java +++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; import android.util.Log; + import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.AppProvider; diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java index 540c39264..074b24676 100644 --- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java +++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.util.Log; + import org.fdroid.fdroid.data.InstalledAppProvider; public class PackageRemovedReceiver extends PackageReceiver { diff --git a/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java index 8511622e4..94ee14b1c 100644 --- a/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java @@ -2,13 +2,18 @@ package org.fdroid.fdroid.updater; import android.content.Context; import android.util.Log; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Hasher; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Repo; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.security.cert.Certificate; import java.util.Date; import java.util.jar.JarEntry; diff --git a/F-Droid/src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java index 77e98bfe5..b3b4503bd 100644 --- a/F-Droid/src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java @@ -2,6 +2,7 @@ package org.fdroid.fdroid.updater; import android.content.Context; import android.util.Log; + import org.fdroid.fdroid.data.Repo; import java.io.File; diff --git a/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java b/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java index 2007f666e..1a676643a 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java @@ -8,7 +8,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.res.Configuration; import android.net.Uri; import android.net.wifi.WifiManager; import android.nfc.NdefMessage; @@ -20,7 +19,6 @@ import android.os.Bundle; import android.support.v4.content.LocalBroadcastManager; import android.support.v7.app.ActionBarActivity; import android.text.TextUtils; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java b/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java index eac695101..256dc4aa0 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java @@ -13,7 +13,11 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; -import org.fdroid.fdroid.*; + +import org.fdroid.fdroid.FDroidApp; +import org.fdroid.fdroid.Preferences; +import org.fdroid.fdroid.QrGenAsyncTask; +import org.fdroid.fdroid.R; import org.fdroid.fdroid.net.WifiStateChangeService; public class QrWizardDownloadActivity extends ActionBarActivity { diff --git a/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java b/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java index bd7210c96..c7f0f98ea 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java @@ -15,6 +15,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.QrGenAsyncTask; import org.fdroid.fdroid.R; diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java index aa816bda6..edc4d0e39 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java +++ b/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java @@ -6,13 +6,13 @@ import android.support.v4.widget.CursorAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; - import android.widget.CompoundButton; import android.widget.RelativeLayout; import android.widget.TextView; + import org.fdroid.fdroid.R; -import org.fdroid.fdroid.compat.SwitchCompat; import org.fdroid.fdroid.compat.LayoutCompat; +import org.fdroid.fdroid.compat.SwitchCompat; import org.fdroid.fdroid.data.Repo; public class RepoAdapter extends CursorAdapter { diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java index fac348d14..4d6a1e710 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java @@ -14,6 +14,7 @@ import android.util.Log; import android.view.MenuItem; import android.widget.LinearLayout; import android.widget.Toast; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.NfcHelper; import org.fdroid.fdroid.Utils; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index 32e649819..66cc470a5 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -20,6 +20,7 @@ import android.widget.ArrayAdapter; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.Spinner; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java index 8ee5baeef..098e739b9 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.views.fragments; import android.net.Uri; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.views.AppListAdapter; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index c17c9b887..f64bbd77a 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -7,9 +7,8 @@ import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; -import android.text.TextUtils; - import android.support.v4.preference.PreferenceFragment; +import android.text.TextUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.PreferencesActivity; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java index ceac2b360..ecb61d9db 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java @@ -25,6 +25,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; + import org.fdroid.fdroid.NfcNotEnabledActivity; import org.fdroid.fdroid.ProgressListener; import org.fdroid.fdroid.R; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java index 675595b82..5ccb0f4bc 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java @@ -15,6 +15,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ListView; import android.widget.TextView; + import org.fdroid.fdroid.AppDetails; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java index 0a846ca67..324c2996a 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java @@ -8,6 +8,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; + import org.fdroid.fdroid.R; public abstract class ThemeableListFragment extends ListFragment { diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java index c5998ac01..e5da26df8 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java @@ -12,6 +12,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import org.fdroid.fdroid.ProgressListener; import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java index 65391ce9d..7bbc461d7 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java @@ -18,6 +18,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; import org.fdroid.fdroid.net.WifiStateChangeService; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java index 01167d534..6cf5b23e6 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java @@ -11,6 +11,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.CompoundButton; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java index ee9176a3d..7446d4c5f 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java @@ -15,8 +15,19 @@ import android.support.v4.view.MenuItemCompat; import android.support.v4.widget.CursorAdapter; import android.support.v7.widget.SearchView; import android.text.TextUtils; -import android.view.*; -import android.widget.*; +import android.view.ContextThemeWrapper; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.ImageView; +import android.widget.ListView; +import android.widget.TextView; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.InstalledAppProvider; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java index 1eb5cb883..527b39b6b 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java @@ -8,6 +8,7 @@ import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import org.fdroid.fdroid.R; public class StartSwapFragment extends Fragment { diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java index c8516e0cc..9d176cedc 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java @@ -5,13 +5,14 @@ import android.content.Context; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; import android.os.Handler; +import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v7.app.ActionBarActivity; import android.view.MenuItem; import android.widget.Toast; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.NfcHelper; import org.fdroid.fdroid.Preferences; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java index 029eedd0d..d95a79eb8 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.NavUtils; import android.support.annotation.Nullable; +import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBarActivity; import android.util.Log; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java index ad0b82a13..046bb5dd1 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java @@ -20,8 +20,10 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; + import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; + import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.fdroid.fdroid.FDroid; diff --git a/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java b/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java index f0b64122e..2a3f5a8d1 100644 --- a/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java +++ b/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java @@ -20,9 +20,9 @@ import android.content.ContentProvider; import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; -import android.test.mock.MockContext; -import android.test.mock.MockContentResolver; import android.database.DatabaseUtils; +import android.test.mock.MockContentResolver; +import android.test.mock.MockContext; import java.io.File; diff --git a/F-Droid/test/src/mock/MockCategoryResources.java b/F-Droid/test/src/mock/MockCategoryResources.java index 2831049d8..706f0f526 100644 --- a/F-Droid/test/src/mock/MockCategoryResources.java +++ b/F-Droid/test/src/mock/MockCategoryResources.java @@ -1,8 +1,8 @@ package mock; import android.content.Context; -import android.test.mock.*; -import org.fdroid.fdroid.*; + +import org.fdroid.fdroid.R; public class MockCategoryResources extends MockFDroidResources { diff --git a/F-Droid/test/src/mock/MockContextSwappableComponents.java b/F-Droid/test/src/mock/MockContextSwappableComponents.java index 9cb09f466..20578915c 100644 --- a/F-Droid/test/src/mock/MockContextSwappableComponents.java +++ b/F-Droid/test/src/mock/MockContextSwappableComponents.java @@ -2,7 +2,8 @@ package mock; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.test.mock.*; +import android.test.mock.MockContentResolver; +import android.test.mock.MockContext; public class MockContextSwappableComponents extends MockContext { diff --git a/F-Droid/test/src/mock/MockFDroidResources.java b/F-Droid/test/src/mock/MockFDroidResources.java index 96b6a01d9..ef8a1b513 100644 --- a/F-Droid/test/src/mock/MockFDroidResources.java +++ b/F-Droid/test/src/mock/MockFDroidResources.java @@ -1,9 +1,9 @@ package mock; import android.content.Context; -import android.content.res.Resources; -import android.test.mock.*; -import org.fdroid.fdroid.*; +import android.test.mock.MockResources; + +import org.fdroid.fdroid.R; public class MockFDroidResources extends MockResources { diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java index 678c9903f..b62c3f6dc 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java @@ -3,6 +3,7 @@ package org.fdroid.fdroid; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; + import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.mock.MockApk; diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java index e77ef41bc..17893ddef 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java @@ -6,7 +6,6 @@ import android.net.Uri; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; -import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.mock.MockApk; import org.fdroid.fdroid.mock.MockApp; diff --git a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java index a769d5c83..654680ee2 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java @@ -5,10 +5,6 @@ import android.content.ContentValues; import android.content.res.Resources; import android.database.Cursor; -import mock.MockCategoryResources; -import mock.MockContextSwappableComponents; -import mock.MockInstallablePackageManager; - import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; @@ -17,6 +13,10 @@ import org.fdroid.fdroid.data.InstalledAppCacheUpdater; import java.util.ArrayList; import java.util.List; +import mock.MockCategoryResources; +import mock.MockContextSwappableComponents; +import mock.MockInstallablePackageManager; + public class AppProviderTest extends FDroidProviderTest { public AppProviderTest() { diff --git a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java index 7c2e42bc4..cc605d083 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java @@ -3,6 +3,7 @@ package org.fdroid.fdroid; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; + import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; diff --git a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java index 4102b9690..089bc9693 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java @@ -10,14 +10,18 @@ import android.os.Build; import android.provider.ContactsContract; import android.test.ProviderTestCase2MockContext; +import org.fdroid.fdroid.data.ApkProvider; +import org.fdroid.fdroid.data.AppProvider; +import org.fdroid.fdroid.data.FDroidProvider; +import org.fdroid.fdroid.data.InstalledAppProvider; +import org.fdroid.fdroid.data.RepoProvider; + +import java.util.List; + import mock.MockContextEmptyComponents; import mock.MockContextSwappableComponents; import mock.MockFDroidResources; -import org.fdroid.fdroid.data.*; - -import java.util.List; - public abstract class FDroidProviderTest extends ProviderTestCase2MockContext { private FDroidProvider[] allProviders = { diff --git a/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java b/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java index 1ab615b3c..5ea33f3ee 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java @@ -3,6 +3,7 @@ package org.fdroid.fdroid; import android.os.Build; import android.test.InstrumentationTestCase; import android.util.Log; + import org.fdroid.fdroid.compat.FileCompatForTest; import org.fdroid.fdroid.data.SanitizedFile; diff --git a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java index ff512de0b..740d3baee 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java @@ -1,9 +1,9 @@ package org.fdroid.fdroid; -import mock.MockInstallablePackageManager; - import org.fdroid.fdroid.data.InstalledAppProvider; +import mock.MockInstallablePackageManager; + /** * Tests the ability of the {@link org.fdroid.fdroid.data.InstalledAppCacheUpdater} to stay in sync with * the {@link android.content.pm.PackageManager}. diff --git a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java index bc1a176ce..c81def02d 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java @@ -2,9 +2,12 @@ package org.fdroid.fdroid; import android.content.ContentValues; -import mock.MockInstallablePackageManager; +import org.fdroid.fdroid.data.ApkProvider; +import org.fdroid.fdroid.data.AppProvider; +import org.fdroid.fdroid.data.InstalledAppProvider; +import org.fdroid.fdroid.data.RepoProvider; -import org.fdroid.fdroid.data.*; +import mock.MockInstallablePackageManager; public class InstalledAppProviderTest extends FDroidProviderTest { diff --git a/F-Droid/test/src/org/fdroid/fdroid/SanitizedFileTest.java b/F-Droid/test/src/org/fdroid/fdroid/SanitizedFileTest.java index 6cde747fc..0c84550fd 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/SanitizedFileTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/SanitizedFileTest.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid; import android.test.AndroidTestCase; + import org.fdroid.fdroid.data.SanitizedFile; import java.io.File; diff --git a/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java b/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java index 2bb7e89ca..76eebdb48 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java +++ b/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java @@ -1,25 +1,34 @@ package org.fdroid.fdroid; import android.app.Instrumentation; -import android.content.*; +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.content.Intent; import android.net.Uri; import android.os.Environment; import android.util.Log; + import junit.framework.AssertionFailedError; -import mock.MockContextSwappableComponents; -import mock.MockInstallablePackageManager; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.receiver.PackageAddedReceiver; import org.fdroid.fdroid.receiver.PackageRemovedReceiver; import org.fdroid.fdroid.receiver.PackageUpgradedReceiver; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import mock.MockContextSwappableComponents; +import mock.MockInstallablePackageManager; + public class TestUtils { private static final String TAG = "fdroid.TestUtils"; diff --git a/F-Droid/test/src/org/fdroid/fdroid/compat/FileCompatForTest.java b/F-Droid/test/src/org/fdroid/fdroid/compat/FileCompatForTest.java index f5ac4607f..e493b480c 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/compat/FileCompatForTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/compat/FileCompatForTest.java @@ -2,13 +2,8 @@ package org.fdroid.fdroid.compat; import android.annotation.TargetApi; import android.os.Build; -import android.system.ErrnoException; -import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.data.SanitizedFile; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; +import org.fdroid.fdroid.data.SanitizedFile; /** * Used to expose the protected methods from FileCompat in a public manner so