diff --git a/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java b/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java index 2fed8a798..50688fb69 100644 --- a/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java +++ b/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java @@ -4,12 +4,13 @@ import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; -import javax.jmdns.ServiceInfo; -import javax.jmdns.impl.util.ByteWrangler; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.UnknownHostException; +import javax.jmdns.ServiceInfo; +import javax.jmdns.impl.util.ByteWrangler; + /** * The ServiceInfo class needs to be serialized in order to be sent as an Android broadcast. * In order to make it Parcelable (or Serializable for that matter), there are some package-scope diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java index 0ffa9b913..8c00f8412 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java @@ -10,15 +10,17 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Message; import android.os.Process; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.nearby.peers.BluetoothPeer; import java.lang.ref.WeakReference; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Manage the {@link android.bluetooth.BluetoothAdapter}in a {@link HandlerThread}. * The start process is in {@link HandlerThread#onLooperPrepared()} so that it is diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java index 47d181e95..c4c54ff3f 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java @@ -5,7 +5,7 @@ import android.bluetooth.BluetoothServerSocket; import android.bluetooth.BluetoothSocket; import android.util.Log; import android.webkit.MimeTypeMap; -import fi.iki.elonen.NanoHTTPD; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.nearby.httpish.Request; import org.fdroid.fdroid.nearby.httpish.Response; @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import fi.iki.elonen.NanoHTTPD; + /** * Act as a layer on top of LocalHTTPD server, by forwarding requests served * over bluetooth to that server. diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java index bd48e1473..43dd234e2 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java @@ -10,9 +10,6 @@ import android.os.Process; import android.text.TextUtils; import android.util.Log; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Utils; @@ -28,6 +25,9 @@ import javax.jmdns.ServiceEvent; import javax.jmdns.ServiceInfo; import javax.jmdns.ServiceListener; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Manage {@link JmDNS} in a {@link HandlerThread}. The start process is in * {@link HandlerThread#onLooperPrepared()} so that it is always started before diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java index cda15831e..744e08ee2 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java @@ -35,11 +35,9 @@ package org.fdroid.fdroid.nearby; import android.content.Context; import android.net.Uri; -import fi.iki.elonen.NanoHTTPD; -import fi.iki.elonen.NanoHTTPD.Response.IStatus; + import org.fdroid.fdroid.BuildConfig; -import javax.net.ssl.SSLServerSocketFactory; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -62,6 +60,11 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.TimeZone; +import javax.net.ssl.SSLServerSocketFactory; + +import fi.iki.elonen.NanoHTTPD; +import fi.iki.elonen.NanoHTTPD.Response.IStatus; + /** * A HTTP server for serving the files that are being swapped via WiFi, etc. * The only changes were to remove unneeded extras like {@code main()}, the diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java index 82edfcac0..2692838e4 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java @@ -6,8 +6,8 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Message; import android.os.Process; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; @@ -15,6 +15,8 @@ import java.io.IOException; import java.net.BindException; import java.util.Random; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Manage {@link LocalHTTPD} in a {@link HandlerThread}; */ diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java index 829d92815..94ce9e6d7 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java @@ -2,7 +2,7 @@ package org.fdroid.fdroid.nearby; import android.content.Context; import android.util.Log; -import kellinwood.security.zipsigner.ZipSigner; + import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.GeneralName; @@ -19,9 +19,6 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Utils; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.X509KeyManager; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -49,6 +46,12 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.X509KeyManager; + +import kellinwood.security.zipsigner.ZipSigner; + // TODO Address exception handling in a uniform way throughout @SuppressWarnings("LineLength") diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java index 14d653613..0c5182586 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java @@ -12,8 +12,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Hasher; import org.fdroid.fdroid.IndexUpdater; @@ -50,6 +49,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * The {@link SwapService} deals with managing the entire workflow from selecting apps to * swap, to invoking this class to prepare the webroot, to enabling various communication protocols. diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java index 4a7ea268c..882310276 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java @@ -4,7 +4,7 @@ import android.app.IntentService; import android.content.Context; import android.content.Intent; import android.os.Process; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; @@ -15,6 +15,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.Set; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Handles setting up and generating the local repo used to swap apps, including * the {@code index.jar}, the symlinks to the shared APKs, etc. diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java index 9de7e7408..d23887232 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java @@ -29,7 +29,7 @@ import android.os.Build; import android.os.Environment; import android.os.Process; import android.util.Log; -import androidx.core.content.ContextCompat; + import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.IndexV1Updater; import org.fdroid.fdroid.Utils; @@ -44,6 +44,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; +import androidx.core.content.ContextCompat; + /** * An {@link IntentService} subclass for scanning removable "external storage" * for F-Droid package repos, e.g. SD Cards. This is intended to support diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java index d3fa77052..6890230c0 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java @@ -4,7 +4,6 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.pm.PackageManager; import android.database.Cursor; -import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; @@ -21,6 +20,10 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.data.InstalledAppProvider; +import org.fdroid.fdroid.data.Schema.InstalledAppTable; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; @@ -29,10 +32,6 @@ import androidx.loader.app.LoaderManager; import androidx.loader.content.CursorLoader; import androidx.loader.content.Loader; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.data.InstalledAppProvider; -import org.fdroid.fdroid.data.Schema.InstalledAppTable; - public class SelectAppsView extends SwapView implements LoaderManager.LoaderCallbacks { public SelectAppsView(Context context) { diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java index 187fdecc6..ab5f45440 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java @@ -20,11 +20,6 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.SwitchCompat; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; @@ -32,6 +27,10 @@ import org.fdroid.fdroid.nearby.peers.Peer; import java.util.ArrayList; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SwitchCompat; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import cc.mvdan.accesspoint.WifiApControl; @SuppressWarnings("LineLength") diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java index 671edf710..32a7e2a6c 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java @@ -17,13 +17,7 @@ import android.os.AsyncTask; import android.os.IBinder; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.NotificationCompat; -import androidx.core.app.ServiceCompat; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import cc.mvdan.accesspoint.WifiApControl; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.NotificationHelper; import org.fdroid.fdroid.Preferences; @@ -47,6 +41,14 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.core.app.ServiceCompat; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import cc.mvdan.accesspoint.WifiApControl; + /** * Central service which manages all of the different moving parts of swap which are required * to enable p2p swapping of apps. diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java index 052b422e9..898befc79 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java @@ -1,7 +1,6 @@ package org.fdroid.fdroid.nearby; import android.annotation.TargetApi; -import androidx.appcompat.app.AppCompatActivity; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -12,14 +11,6 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.cursoradapter.widget.CursorAdapter; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; @@ -32,7 +23,9 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; + import com.nostra13.universalimageloader.core.ImageLoader; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.Utils; @@ -49,6 +42,16 @@ import org.fdroid.fdroid.net.DownloaderService; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.cursoradapter.widget.CursorAdapter; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * This is a view that shows a listing of all apps in the swap repo that this * just connected to. The app listing and search should be replaced by diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java index c2dcaa251..e3056018e 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java @@ -6,12 +6,12 @@ import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.RelativeLayout; +import org.fdroid.fdroid.R; + import androidx.annotation.ColorInt; import androidx.annotation.LayoutRes; import androidx.core.content.ContextCompat; -import org.fdroid.fdroid.R; - /** * A {@link android.view.View} that registers to handle the swap events from * {@link SwapService}. diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java index 9716dbe98..d8ecdeec7 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java @@ -34,17 +34,6 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.SearchView; -import androidx.appcompat.widget.SwitchCompat; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - import com.google.android.material.appbar.MaterialToolbar; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; @@ -76,6 +65,16 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.SwitchCompat; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import cc.mvdan.accesspoint.WifiApControl; import static org.fdroid.fdroid.views.main.MainActivity.ACTION_REQUEST_SWAP; diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java index 441fc10e2..840ec5f94 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java @@ -29,7 +29,7 @@ import android.os.Build; import android.os.Process; import android.util.Log; import android.widget.Toast; -import androidx.documentfile.provider.DocumentFile; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.AddRepoIntentService; @@ -49,6 +49,8 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarInputStream; +import androidx.documentfile.provider.DocumentFile; + /** * An {@link IntentService} subclass for handling asynchronous scanning of a * removable storage device like an SD Card or USB OTG thumb drive using the diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java index 999495784..9e484aae5 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java @@ -8,13 +8,13 @@ import android.os.Build; import android.os.storage.StorageManager; import android.provider.DocumentsContract; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; - import java.io.File; import java.lang.reflect.Array; import java.lang.reflect.Method; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; + /** * @see Android 5.0 DocumentFile from tree URI diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java index 1eccc2d10..3f14e4ebc 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java @@ -31,9 +31,11 @@ import android.os.Build; import android.os.Handler; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.RequiresApi; + import org.fdroid.fdroid.views.main.NearbyViewBinder; +import androidx.annotation.RequiresApi; + /** * This is just a shim to receive {@link UsbManager#ACTION_USB_ACCESSORY_ATTACHED} diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java index 00b71da99..7a5b27e46 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java @@ -29,11 +29,13 @@ import android.net.Uri; import android.os.Build; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.RequiresApi; + import org.fdroid.fdroid.views.main.NearbyViewBinder; import java.util.HashMap; +import androidx.annotation.RequiresApi; + /** * This is just a shim to receive {@link UsbManager#ACTION_USB_DEVICE_DETACHED} * events. diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java index c07370a29..69bb4b102 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java @@ -4,6 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Environment; + import org.fdroid.fdroid.views.main.NearbyViewBinder; public class UsbDeviceMediaMountedReceiver extends BroadcastReceiver { diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java index fd1bae629..7061bd94f 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java @@ -4,6 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.net.wifi.WifiManager; + import org.fdroid.fdroid.Utils; public class WifiStateChangeReceiver extends BroadcastReceiver { diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java index 70a0549c7..2cbb14a2f 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java @@ -10,12 +10,9 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Build; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; -import cc.mvdan.accesspoint.WifiApControl; + import org.apache.commons.net.util.SubnetUtils; import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.FDroidApp; @@ -34,6 +31,11 @@ import java.security.cert.Certificate; import java.util.Enumeration; import java.util.Locale; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import cc.mvdan.accesspoint.WifiApControl; + /** * Handle state changes to the device's wifi, storing the required bits. * The {@link Intent} that starts it either has no extras included, diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java index 75d6f4fbc..527be8837 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java @@ -5,10 +5,10 @@ import android.bluetooth.BluetoothDevice; import android.os.Parcel; import android.text.TextUtils; -import androidx.annotation.Nullable; - import org.fdroid.fdroid.R; +import androidx.annotation.Nullable; + public class BluetoothPeer implements Peer { private static final String BLUETOOTH_NAME_TAG = "FDroid:"; diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java index 3035a073f..6c5616ca6 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java @@ -2,13 +2,15 @@ package org.fdroid.fdroid.nearby.peers; import android.net.Uri; import android.os.Parcel; -import androidx.annotation.Nullable; import android.text.TextUtils; + import org.fdroid.fdroid.FDroidApp; import javax.jmdns.ServiceInfo; import javax.jmdns.impl.FDroidServiceInfo; +import androidx.annotation.Nullable; + public class BonjourPeer extends WifiPeer { private static final String TAG = "BonjourPeer"; diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java index 77e44a55b..438db6bb1 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.nearby.peers; import android.os.Parcelable; + import androidx.annotation.DrawableRes; /** diff --git a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java index 40a557618..e70041b99 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java @@ -1,8 +1,6 @@ package org.fdroid.fdroid.panic; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -15,6 +13,9 @@ import org.fdroid.fdroid.R; import java.util.regex.Pattern; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + /** * A very hacky calculator which is barely functional. * It is just meant to pass a very casual inspection. diff --git a/app/src/full/java/org/fdroid/fdroid/panic/DestructiveCheckBoxPreference.java b/app/src/full/java/org/fdroid/fdroid/panic/DestructiveCheckBoxPreference.java index 67fe2fb3e..f3d2a2162 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/DestructiveCheckBoxPreference.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/DestructiveCheckBoxPreference.java @@ -3,13 +3,13 @@ package org.fdroid.fdroid.panic; import android.content.Context; import android.util.AttributeSet; +import org.fdroid.fdroid.FDroidApp; +import org.fdroid.fdroid.R; + import androidx.core.content.ContextCompat; import androidx.preference.CheckBoxPreference; import androidx.preference.PreferenceViewHolder; -import org.fdroid.fdroid.FDroidApp; -import org.fdroid.fdroid.R; - public class DestructiveCheckBoxPreference extends CheckBoxPreference { public DestructiveCheckBoxPreference(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); diff --git a/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java b/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java index 5927ec02c..563d1cba7 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java @@ -3,13 +3,13 @@ package org.fdroid.fdroid.panic; import android.content.Context; import android.util.AttributeSet; +import org.fdroid.fdroid.FDroidApp; +import org.fdroid.fdroid.R; + import androidx.core.content.ContextCompat; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import org.fdroid.fdroid.FDroidApp; -import org.fdroid.fdroid.R; - public class DestructivePreference extends Preference { public DestructivePreference(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); diff --git a/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java index e7153e023..3e49ac274 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java @@ -3,6 +3,7 @@ package org.fdroid.fdroid.panic; import android.content.Intent; import android.os.Build; import android.os.Bundle; + import androidx.appcompat.app.AppCompatActivity; public class ExitActivity extends AppCompatActivity { diff --git a/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java b/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java index d9a69a56a..9b5db97bf 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java @@ -7,12 +7,14 @@ import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import androidx.core.app.NotificationManagerCompat; -import androidx.appcompat.app.AlertDialog; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.R; import org.fdroid.fdroid.views.main.MainActivity; +import androidx.appcompat.app.AlertDialog; +import androidx.core.app.NotificationManagerCompat; + /** * This class is encapsulating all methods related to hiding the app from the launcher * and restoring it. diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java index 2aa3fa2ea..0ca489b5b 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java @@ -3,13 +3,13 @@ package org.fdroid.fdroid.panic; import android.os.Bundle; import android.view.View; -import androidx.appcompat.app.AppCompatActivity; - import com.google.android.material.appbar.MaterialToolbar; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; +import androidx.appcompat.app.AppCompatActivity; + public class PanicPreferencesActivity extends AppCompatActivity { @Override diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java index a3ea6802d..9d9e1a62f 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java @@ -1,6 +1,5 @@ package org.fdroid.fdroid.panic; -import androidx.appcompat.app.AppCompatActivity; import android.content.ComponentName; import android.content.DialogInterface; import android.content.Intent; @@ -16,16 +15,6 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.TypedValue; -import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.core.content.ContextCompat; -import androidx.preference.CheckBoxPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceFragmentCompat; - import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.installer.PrivilegedInstaller; @@ -33,6 +22,16 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller; import java.util.ArrayList; import java.util.Set; +import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.preference.CheckBoxPreference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragmentCompat; import info.guardianproject.panic.Panic; import info.guardianproject.panic.PanicResponder; diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java index 02dd591ab..fb3e673e4 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java @@ -1,17 +1,13 @@ package org.fdroid.fdroid.panic; -import androidx.appcompat.app.AppCompatActivity; import android.content.BroadcastReceiver; import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; -import info.guardianproject.panic.Panic; -import info.guardianproject.panic.PanicResponder; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.DBHelper; @@ -31,6 +27,11 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import androidx.appcompat.app.AppCompatActivity; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import info.guardianproject.panic.Panic; +import info.guardianproject.panic.PanicResponder; + /** * This {@link AppCompatActivity} is purely to run events in response to a panic trigger. * It needs to be an {@code AppCompatActivity} rather than a {@link android.app.Service} diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java index 3e5666069..dbcdb1f7d 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java @@ -1,9 +1,8 @@ package org.fdroid.fdroid.panic; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.views.installed.InstalledAppListAdapter; @@ -11,6 +10,9 @@ import org.fdroid.fdroid.views.installed.InstalledAppListItemController; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + public class SelectInstalledAppListAdapter extends InstalledAppListAdapter { private final Set selectedApps; diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java index fd482cdfe..3b5642fe8 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java @@ -1,9 +1,7 @@ package org.fdroid.fdroid.panic; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.View; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.views.apps.AppListItemState; @@ -11,6 +9,10 @@ import org.fdroid.fdroid.views.installed.InstalledAppListItemController; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + /** * Shows the currently installed apps as a selectable list. */ diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java index 08770f15e..9299c8052 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java @@ -27,14 +27,6 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.google.android.material.appbar.MaterialToolbar; import org.fdroid.fdroid.FDroidApp; @@ -43,6 +35,14 @@ import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.InstalledAppProvider; import org.fdroid.fdroid.views.installed.InstalledAppListAdapter; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class SelectInstalledAppsActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private InstalledAppListAdapter adapter; diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java index 4d636053c..1a65a72c3 100644 --- a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java +++ b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java @@ -6,15 +6,9 @@ import android.os.Bundle; import android.view.View; import android.widget.FrameLayout; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.google.android.material.floatingactionbutton.FloatingActionButton; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; @@ -31,6 +25,15 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + /** * Responsible for ensuring that the categories view is inflated and then populated correctly. * Will start a loader to get the list of categories from the database and populate a recycler diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java index 985cbfb90..fe37a6161 100644 --- a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java +++ b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java @@ -2,15 +2,15 @@ package org.fdroid.fdroid.views.main; import android.widget.FrameLayout; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.views.PreferencesFragment; +import org.fdroid.fdroid.views.updates.UpdatesViewBinder; + import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.views.PreferencesFragment; -import org.fdroid.fdroid.views.updates.UpdatesViewBinder; - /** * Decides which view on the main screen to attach to a given {@link FrameLayout}. This class * doesn't know which view it will be rendering at the time it is constructed. Rather, at some diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java index 4c0a6c64d..876415f9b 100644 --- a/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java +++ b/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java @@ -1,7 +1,6 @@ package org.fdroid.fdroid.views.main; import android.Manifest; -import androidx.appcompat.app.AppCompatActivity; import android.content.Context; import android.content.Intent; import android.content.UriPermission; @@ -22,9 +21,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.RequiresApi; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.nearby.SDCardScannerService; @@ -34,6 +31,11 @@ import org.fdroid.fdroid.nearby.TreeUriScannerIntentService; import java.io.File; import java.util.List; +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + /** * A splash screen encouraging people to start the swap process. The swap * process is quite heavy duty in that it fires up Bluetooth and/or WiFi diff --git a/app/src/main/java/org/fdroid/fdroid/AboutActivity.java b/app/src/main/java/org/fdroid/fdroid/AboutActivity.java index 43048d79f..f0d5677c2 100644 --- a/app/src/main/java/org/fdroid/fdroid/AboutActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/AboutActivity.java @@ -1,11 +1,12 @@ package org.fdroid.fdroid; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + public class AboutActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java b/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java index 318812bf3..8ff65b6cc 100644 --- a/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java +++ b/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java @@ -5,10 +5,9 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.views.ManageReposActivity; @@ -18,6 +17,9 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Locale; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Handles requests to add new repos via URLs. This is an {@code IntentService} * so that requests are queued, which is necessary when either diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java index 6392b42ce..1ba6544ff 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java +++ b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java @@ -9,10 +9,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.TaskStackBuilder; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; @@ -28,6 +25,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.TaskStackBuilder; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Manages the state of APKs that are being installed or that have updates available. * This also ensures the state is saved across F-Droid restarts, and repopulates diff --git a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java index 0b84ec7fa..c4ce98cd4 100644 --- a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java +++ b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Build; -import androidx.annotation.Nullable; + import org.fdroid.fdroid.compat.SupportedArchitectures; import org.fdroid.fdroid.data.Apk; @@ -14,6 +14,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.annotation.Nullable; + // Call getIncompatibleReasons(apk) on an instance of this class to // find reasons why an apk may be incompatible with the user's device. public class CompatibilityChecker { diff --git a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java b/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java index fbbb4baca..60e877277 100644 --- a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java +++ b/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java @@ -3,14 +3,16 @@ package org.fdroid.fdroid; import android.content.Context; import android.content.Intent; import android.os.Process; -import androidx.annotation.NonNull; -import androidx.core.app.JobIntentService; -import androidx.core.content.ContextCompat; import android.util.Log; + import org.apache.commons.io.FileUtils; import java.io.File; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; +import androidx.core.content.ContextCompat; + /** * An {@link JobIntentService} subclass for deleting the full cache for this app. */ diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java index b02e25c1b..4c6ab97bd 100644 --- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java +++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java @@ -45,12 +45,6 @@ import android.util.Log; import android.view.Display; import android.view.WindowManager; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.app.AppCompatDelegate; -import androidx.collection.LongSparseArray; -import androidx.core.content.ContextCompat; import com.nostra13.universalimageloader.cache.disc.DiskCache; import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache; @@ -59,8 +53,7 @@ import com.nostra13.universalimageloader.core.DefaultConfigurationFactory; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; import com.nostra13.universalimageloader.core.process.BitmapProcessor; -import info.guardianproject.netcipher.NetCipher; -import info.guardianproject.netcipher.proxy.OrbotHelper; + import org.acra.ACRA; import org.acra.ReportField; import org.acra.ReportingInteractionMode; @@ -84,13 +77,23 @@ import org.fdroid.fdroid.net.ImageLoaderForUIL; import org.fdroid.fdroid.panic.HidingManager; import org.fdroid.fdroid.work.CleanCacheWorker; -import javax.microedition.khronos.opengles.GL10; import java.io.IOException; import java.nio.ByteBuffer; import java.security.Security; import java.util.List; import java.util.UUID; +import javax.microedition.khronos.opengles.GL10; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.collection.LongSparseArray; +import androidx.core.content.ContextCompat; +import info.guardianproject.netcipher.NetCipher; +import info.guardianproject.netcipher.proxy.OrbotHelper; + @ReportsCrashes(mailTo = BuildConfig.ACRA_REPORT_EMAIL, mode = ReportingInteractionMode.DIALOG, reportDialogClass = org.fdroid.fdroid.acra.CrashReportActivity.class, diff --git a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java index 78f1d4156..614cd6e7e 100644 --- a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java +++ b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java @@ -27,9 +27,9 @@ import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; import android.content.pm.PackageInfo; -import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.App; @@ -48,9 +48,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -64,6 +61,12 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import androidx.annotation.NonNull; + // TODO move to org.fdroid.fdroid.updater // TODO reduce visibility of methods once in .updater package (.e.g tests need it public now) diff --git a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java index 73d4b8b53..ed7987020 100644 --- a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java +++ b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java @@ -25,9 +25,9 @@ package org.fdroid.fdroid; import android.content.ContentValues; import android.content.Context; import android.content.pm.PackageInfo; -import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; + import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.core.JsonFactory; @@ -36,6 +36,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.App; @@ -47,10 +48,6 @@ import org.fdroid.fdroid.data.Schema; import org.fdroid.fdroid.net.Downloader; import org.fdroid.fdroid.net.DownloaderFactory; -import javax.net.ssl.SSLHandshakeException; -import javax.net.ssl.SSLKeyException; -import javax.net.ssl.SSLPeerUnverifiedException; -import javax.net.ssl.SSLProtocolException; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -71,6 +68,13 @@ import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import javax.net.ssl.SSLHandshakeException; +import javax.net.ssl.SSLKeyException; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.net.ssl.SSLProtocolException; + +import androidx.annotation.NonNull; + /** * Receives the index data about all available apps and packages via the V1 * JSON data {@link #DATA_FILE_NAME}, embedded in a signed jar diff --git a/app/src/main/java/org/fdroid/fdroid/Languages.java b/app/src/main/java/org/fdroid/fdroid/Languages.java index 86fc477e2..8871c431d 100644 --- a/app/src/main/java/org/fdroid/fdroid/Languages.java +++ b/app/src/main/java/org/fdroid/fdroid/Languages.java @@ -8,8 +8,6 @@ import android.content.res.Resources; import android.os.Build; import android.text.TextUtils; -import androidx.appcompat.app.AppCompatActivity; - import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; @@ -18,6 +16,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import androidx.appcompat.app.AppCompatActivity; + public final class Languages { public static final String TAG = "Languages"; diff --git a/app/src/main/java/org/fdroid/fdroid/NfcHelper.java b/app/src/main/java/org/fdroid/fdroid/NfcHelper.java index ffe561f7a..582ebcf9a 100644 --- a/app/src/main/java/org/fdroid/fdroid/NfcHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/NfcHelper.java @@ -1,7 +1,6 @@ package org.fdroid.fdroid; import android.annotation.TargetApi; -import androidx.appcompat.app.AppCompatActivity; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -12,6 +11,8 @@ import android.nfc.NfcAdapter; import android.os.Build; import android.util.Log; +import androidx.appcompat.app.AppCompatActivity; + public class NfcHelper { private static final String TAG = "NfcHelper"; diff --git a/app/src/main/java/org/fdroid/fdroid/NfcNotEnabledActivity.java b/app/src/main/java/org/fdroid/fdroid/NfcNotEnabledActivity.java index 141b32099..ebe97b3ba 100644 --- a/app/src/main/java/org/fdroid/fdroid/NfcNotEnabledActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/NfcNotEnabledActivity.java @@ -6,6 +6,7 @@ import android.nfc.NfcAdapter; import android.os.Build; import android.os.Bundle; import android.provider.Settings; + import androidx.appcompat.app.AppCompatActivity; // aka Android 4.0 aka Ice Cream Sandwich diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java index 0e74f8dbc..8af975d2c 100644 --- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java @@ -20,11 +20,6 @@ import android.text.TextUtils; import android.text.style.StyleSpan; import android.view.View; -import androidx.core.app.NotificationCompat; -import androidx.core.app.NotificationManagerCompat; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.assist.ImageSize; @@ -38,6 +33,11 @@ import org.fdroid.fdroid.views.main.MainActivity; import java.util.ArrayList; import java.util.Arrays; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + @SuppressWarnings("LineLength") public class NotificationHelper { public static final String CHANNEL_SWAPS = "swap-channel"; diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index 83410276b..25ca46f27 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -30,8 +30,7 @@ import android.net.NetworkInfo; import android.os.Build; import android.text.format.DateUtils; import android.util.Log; -import androidx.core.content.ContextCompat; -import androidx.preference.PreferenceManager; + import org.fdroid.fdroid.installer.PrivilegedInstaller; import org.fdroid.fdroid.net.ConnectivityMonitorService; @@ -44,6 +43,9 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; +import androidx.core.content.ContextCompat; +import androidx.preference.PreferenceManager; + /** * Handles shared preferences for FDroid, looking after the names of * preferences, default values and caching. Needs to be setup in the FDroidApp diff --git a/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java b/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java index dea378149..707e1c23e 100644 --- a/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java +++ b/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java @@ -1,11 +1,11 @@ package org.fdroid.fdroid; -import androidx.annotation.NonNull; - import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; +import androidx.annotation.NonNull; + class ProgressBufferedInputStream extends BufferedInputStream { private final ProgressListener progressListener; diff --git a/app/src/main/java/org/fdroid/fdroid/Provisioner.java b/app/src/main/java/org/fdroid/fdroid/Provisioner.java index 2ae8d49bb..809b3a298 100644 --- a/app/src/main/java/org/fdroid/fdroid/Provisioner.java +++ b/app/src/main/java/org/fdroid/fdroid/Provisioner.java @@ -4,7 +4,9 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.util.Base64; + import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index fb3c067fd..fa866259f 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -38,12 +38,6 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.core.app.JobIntentService; -import androidx.core.app.NotificationCompat; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.App; @@ -61,6 +55,12 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; +import androidx.core.app.NotificationCompat; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + public class UpdateService extends JobIntentService { private static final String TAG = "UpdateService"; diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java index 4020156f8..9cef14395 100644 --- a/app/src/main/java/org/fdroid/fdroid/Utils.java +++ b/app/src/main/java/org/fdroid/fdroid/Utils.java @@ -48,15 +48,13 @@ import android.view.View; import android.view.ViewTreeObserver; import android.widget.ImageView; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.ImageScaleType; import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import com.nostra13.universalimageloader.utils.StorageUtils; + import org.fdroid.fdroid.compat.FileCompat; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.Repo; @@ -94,6 +92,11 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + public final class Utils { private static final String TAG = "Utils"; diff --git a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java index a761076dc..9423f1fd9 100644 --- a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java @@ -2,12 +2,13 @@ package org.fdroid.fdroid.acra; import android.content.DialogInterface; import android.os.Bundle; -import androidx.appcompat.app.AlertDialog; import android.widget.EditText; import org.acra.dialog.BaseCrashReportDialog; import org.fdroid.fdroid.R; +import androidx.appcompat.app.AlertDialog; + public class CrashReportActivity extends BaseCrashReportDialog implements DialogInterface.OnDismissListener, DialogInterface.OnClickListener { diff --git a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java index 2e1a09ea7..ea3794301 100644 --- a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java +++ b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java @@ -4,13 +4,15 @@ package org.fdroid.fdroid.acra; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.annotation.NonNull; + import org.acra.ReportField; import org.acra.collections.ImmutableSet; import org.acra.collector.CrashReportData; import org.acra.config.ACRAConfiguration; import org.acra.sender.ReportSender; +import androidx.annotation.NonNull; + public class CrashReportSender implements ReportSender { private final ACRAConfiguration config; diff --git a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSenderFactory.java b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSenderFactory.java index 5007be493..276381b8f 100644 --- a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSenderFactory.java +++ b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSenderFactory.java @@ -1,12 +1,13 @@ package org.fdroid.fdroid.acra; import android.content.Context; -import androidx.annotation.NonNull; import org.acra.config.ACRAConfiguration; import org.acra.sender.ReportSender; import org.acra.sender.ReportSenderFactory; +import androidx.annotation.NonNull; + public class CrashReportSenderFactory implements ReportSenderFactory { @NonNull @Override diff --git a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java index 97b978d0b..215826779 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java @@ -5,8 +5,6 @@ import android.os.Build; import android.system.ErrnoException; import android.util.Log; -import androidx.annotation.RequiresApi; - import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.SanitizedFile; @@ -14,6 +12,8 @@ import org.fdroid.fdroid.data.SanitizedFile; import java.io.IOException; import java.lang.reflect.Method; +import androidx.annotation.RequiresApi; + /** * This class works only with {@link SanitizedFile} instances to enforce * filtering of the file names from files downloaded from the internet. diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/app/src/main/java/org/fdroid/fdroid/data/Apk.java index 85efaa89e..8d6d9c79b 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Apk.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Apk.java @@ -12,11 +12,11 @@ import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; import android.webkit.MimeTypeMap; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.ApkTable.Cols; @@ -30,6 +30,9 @@ import java.util.HashSet; import java.util.Locale; import java.util.zip.ZipFile; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Represents a single package of an application. This represents one particular * package of a given application, for info about the app in general, see diff --git a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java index 47467b470..266e0ba06 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java @@ -6,9 +6,8 @@ import android.content.Context; import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.util.Log; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.AntiFeatureTable; import org.fdroid.fdroid.data.Schema.ApkAntiFeatureJoinTable; @@ -26,6 +25,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class ApkProvider extends FDroidProvider { private static final String TAG = "ApkProvider"; diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index 3ba04b38f..f73db2119 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -17,13 +17,11 @@ import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.os.ConfigurationCompat; -import androidx.core.os.LocaleListCompat; + import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; + import org.apache.commons.io.filefilter.RegexFileFilter; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; @@ -54,6 +52,11 @@ import java.util.jar.JarFile; import java.util.regex.Matcher; import java.util.regex.Pattern; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.os.ConfigurationCompat; +import androidx.core.os.LocaleListCompat; + /** * Represents an application, its availability, and its current installed state. * This represents the app in general, for a specific version of this app, see diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java index 6b5c3211d..e8550c03f 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java @@ -5,11 +5,13 @@ import android.content.Context; import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import org.fdroid.fdroid.data.Schema.AppPrefsTable; import org.fdroid.fdroid.data.Schema.AppPrefsTable.Cols; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class AppPrefsProvider extends FDroidProvider { public static final class Helper { diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java index 04f450ea5..a805d2d2d 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java @@ -8,8 +8,7 @@ import android.database.Cursor; import android.net.Uri; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.ApkAntiFeatureJoinTable; @@ -29,6 +28,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Each app has a bunch of metadata that it associates with a package name (such as org.fdroid.fdroid). * Multiple repositories can host the same package, and provide different metadata for that app. diff --git a/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java b/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java index 7da97e339..b7a121ad3 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; -import androidx.annotation.NonNull; + import org.fdroid.fdroid.data.Schema.AppMetadataTable; import org.fdroid.fdroid.data.Schema.CatJoinTable; import org.fdroid.fdroid.data.Schema.CategoryTable; @@ -16,6 +16,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import androidx.annotation.NonNull; + public class CategoryProvider extends FDroidProvider { public static final String TAG = "CategoryProvider"; diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 20f19860a..771a2ba7e 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -30,6 +30,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; diff --git a/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java b/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java index 42e03e85b..1a579d41b 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java @@ -8,12 +8,13 @@ import android.content.OperationApplicationException; import android.content.UriMatcher; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; -import androidx.annotation.NonNull; import org.fdroid.fdroid.BuildConfig; import java.util.ArrayList; +import androidx.annotation.NonNull; + public abstract class FDroidProvider extends ContentProvider { public static final String TAG = "FDroidProvider"; diff --git a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java index c0551d298..a1183afbe 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java @@ -9,10 +9,9 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.AppMetadataTable; @@ -25,6 +24,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class InstalledAppProvider extends FDroidProvider { private static final String TAG = "InstalledAppProvider"; diff --git a/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java index 251b85cc2..099b0ff82 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java +++ b/app/src/main/java/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 org.fdroid.fdroid.Utils; import org.fdroid.fdroid.nearby.SwapWorkflowActivity; diff --git a/app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java b/app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java index 5b78cfea5..e18b53dee 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java @@ -6,10 +6,10 @@ import android.content.pm.PackageInfo; import android.net.Uri; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; - import org.fdroid.fdroid.Utils; +import androidx.appcompat.app.AppCompatActivity; + /** * Replies with the public download URL for the OBB that belongs to the * requesting app/version. If it doesn't know the OBB URL for the requesting diff --git a/app/src/main/java/org/fdroid/fdroid/data/PackageIdProvider.java b/app/src/main/java/org/fdroid/fdroid/data/PackageIdProvider.java index fc6edccc9..b1a06208a 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/PackageIdProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/PackageIdProvider.java @@ -5,10 +5,12 @@ import android.content.Context; import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; -import androidx.annotation.NonNull; + import org.fdroid.fdroid.data.Schema.PackageTable; import org.fdroid.fdroid.data.Schema.PackageTable.Cols; +import androidx.annotation.NonNull; + public class PackageIdProvider extends FDroidProvider { public static final class Helper { diff --git a/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java b/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java index e2c38da3f..9669a83ed 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java +++ b/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java @@ -1,12 +1,13 @@ package org.fdroid.fdroid.data; -import androidx.annotation.Nullable; import android.text.TextUtils; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.annotation.Nullable; + abstract class QueryBuilder { private final List fields = new ArrayList<>(); diff --git a/app/src/main/java/org/fdroid/fdroid/data/Repo.java b/app/src/main/java/org/fdroid/fdroid/data/Repo.java index 05593fd82..d9f8753a2 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Repo.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Repo.java @@ -27,7 +27,9 @@ import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; import android.text.TextUtils; + import com.fasterxml.jackson.annotation.JsonIgnore; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Utils; diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java b/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java index 285bb56ba..bbd7142ee 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java +++ b/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java @@ -6,7 +6,6 @@ import android.content.Context; import android.content.OperationApplicationException; import android.net.Uri; import android.os.RemoteException; -import androidx.annotation.NonNull; import org.fdroid.fdroid.CompatibilityChecker; import org.fdroid.fdroid.IndexUpdater; @@ -17,6 +16,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import androidx.annotation.NonNull; + public class RepoPersister { private static final String TAG = "RepoPersister"; diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java index de16f160c..4bcc5b59b 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java @@ -7,10 +7,9 @@ import android.content.Context; import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.RepoTable; @@ -20,6 +19,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class RepoProvider extends FDroidProvider { private static final String TAG = "RepoProvider"; diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoPushRequest.java b/app/src/main/java/org/fdroid/fdroid/data/RepoPushRequest.java index 98610d6ad..0a0a29b6f 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/RepoPushRequest.java +++ b/app/src/main/java/org/fdroid/fdroid/data/RepoPushRequest.java @@ -19,12 +19,13 @@ package org.fdroid.fdroid.data; -import androidx.annotation.Nullable; import org.fdroid.fdroid.Utils; import java.util.Arrays; import java.util.List; +import androidx.annotation.Nullable; + /** * Represents action requests embedded in the index XML received from a repo. * When {@link #versionCode} is {@code null}, that means that the diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java index 745898771..dcfa2a04d 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java +++ b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java @@ -21,8 +21,7 @@ package org.fdroid.fdroid.data; import android.Manifest; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.ApkTable; import org.xml.sax.Attributes; @@ -34,6 +33,9 @@ import java.util.HashSet; import java.util.List; import java.util.regex.Pattern; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Parses the index.xml into Java data structures. */ diff --git a/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java index 1e688dcf0..b44330da3 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java @@ -5,11 +5,12 @@ import android.content.Context; import android.content.UriMatcher; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; -import androidx.annotation.NonNull; import org.fdroid.fdroid.data.Schema.ApkTable; import org.fdroid.fdroid.data.Schema.ApkTable.Cols; +import androidx.annotation.NonNull; + /** * This class does all of its operations in a temporary sqlite table. */ diff --git a/app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java index 2b5be0655..e290eb84c 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java @@ -7,8 +7,8 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.net.Uri; -import androidx.annotation.NonNull; import android.text.TextUtils; + import org.fdroid.fdroid.data.Schema.ApkTable; import org.fdroid.fdroid.data.Schema.AppMetadataTable; import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; @@ -17,6 +17,8 @@ import org.fdroid.fdroid.data.Schema.PackageTable; import java.util.List; +import androidx.annotation.NonNull; + /** * This class does all of its operations in a temporary sqlite table. */ diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java index 747fcd7c9..55715b206 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java @@ -23,7 +23,9 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.net.Uri; + import com.nostra13.universalimageloader.utils.StorageUtils; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.Hasher; import org.fdroid.fdroid.data.Apk; diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java index b0dd65514..3afff7ed0 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java @@ -24,7 +24,7 @@ import android.content.Intent; import android.content.pm.PackageInfo; import android.net.Uri; import android.os.Build; -import androidx.core.content.FileProvider; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.SanitizedFile; @@ -32,6 +32,8 @@ import org.fdroid.fdroid.data.SanitizedFile; import java.io.File; import java.io.IOException; +import androidx.core.content.FileProvider; + /** * Helper methods for preparing APKs and arbitrary files for installation, * either locally or for sending via bluetooth. diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java index dc0c27485..139449ce5 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; + import org.acra.ACRA; import org.fdroid.fdroid.Utils; diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java index b20db721d..81e89e865 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java @@ -25,13 +25,15 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.Nullable; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Apk; import java.util.Arrays; import java.util.HashSet; +import androidx.annotation.Nullable; + /** * This ApkVerifier verifies that the downloaded apk corresponds to the Apk information * displayed to the user. This is especially important in case an unattended installer diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java index 4003d042a..6843847e4 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java @@ -24,9 +24,11 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.annotation.NonNull; + import org.fdroid.fdroid.data.Apk; +import androidx.annotation.NonNull; + /** * The default installer of F-Droid. It uses the normal Intents APIs of Android * to install apks. Its main inner workings are encapsulated in DefaultInstallerActivity. diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java index 4ba72296c..41698947f 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java @@ -21,7 +21,6 @@ package org.fdroid.fdroid.installer; import android.annotation.SuppressLint; -import androidx.appcompat.app.AppCompatActivity; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Intent; @@ -29,12 +28,14 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import androidx.fragment.app.FragmentActivity; import android.util.Log; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.Apk; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentActivity; + /** * A transparent activity as a wrapper around Android's PackageInstaller Intents */ diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java index 29fd90211..eb9dc241d 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java @@ -19,17 +19,18 @@ package org.fdroid.fdroid.installer; -import androidx.appcompat.app.AppCompatActivity; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.FragmentActivity; -import androidx.appcompat.app.AlertDialog; import android.view.ContextThemeWrapper; import org.fdroid.fdroid.FDroidApp; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentActivity; + public class ErrorDialogActivity extends FragmentActivity { public static final String EXTRA_TITLE = "title"; diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java index 3d86123b6..fb4209628 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java @@ -23,9 +23,11 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.annotation.NonNull; + import org.fdroid.fdroid.data.Apk; +import androidx.annotation.NonNull; + public class FileInstaller extends Installer { public FileInstaller(Context context, @NonNull Apk apk) { diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java index e084ec18e..c068d8441 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java @@ -8,11 +8,7 @@ import android.net.Uri; import android.os.Bundle; import android.view.ContextThemeWrapper; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; -import androidx.fragment.app.FragmentActivity; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; @@ -22,6 +18,12 @@ import org.fdroid.fdroid.data.Apk; import java.io.File; import java.io.IOException; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentActivity; + public class FileInstallerActivity extends FragmentActivity { private static final String TAG = "FileInstallerActivity"; diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java index 40d3f6654..ba8677821 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java @@ -27,7 +27,7 @@ import android.content.IntentFilter; import android.net.Uri; import android.os.Process; import android.text.TextUtils; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Apk; @@ -38,6 +38,8 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Saves all activity of installs and uninstalls to the database for later use, like * displaying in some kind of history viewer or reporting to a "popularity contest" diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java index abe8a784e..c9a2c7671 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java @@ -12,8 +12,7 @@ import android.net.Uri; import android.os.IBinder; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.WildcardFileFilter; import org.fdroid.fdroid.AppUpdateStatusManager; @@ -31,6 +30,9 @@ import java.io.File; import java.io.FileFilter; import java.io.IOException; +import androidx.annotation.NonNull; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Manages the whole process when a background update triggers an install or the user * requests an APK to be installed. It handles checking whether the APK is cached, diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java index 70beb9956..9814ce710 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java @@ -28,9 +28,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.PatternMatcher; -import androidx.annotation.NonNull; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Apk; @@ -42,6 +41,9 @@ import org.fdroid.fdroid.privileged.views.UninstallDialogActivity; import java.io.IOException; +import androidx.annotation.NonNull; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Handles the actual install process. Subclasses implement the details. */ diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java index a3ccd59b1..478d1d1e8 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java @@ -21,11 +21,13 @@ package org.fdroid.fdroid.installer; import android.content.Context; -import androidx.annotation.NonNull; import android.text.TextUtils; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Apk; +import androidx.annotation.NonNull; + public class InstallerFactory { private static final String TAG = "InstallerFactory"; diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java index ba2bde3bf..1ad83389f 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java @@ -24,8 +24,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.core.app.JobIntentService; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.WildcardFileFilter; import org.fdroid.fdroid.Utils; @@ -37,6 +36,9 @@ import java.io.File; import java.io.FileFilter; import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; + /** * This service handles the install process of apk files and * uninstall process of apps. diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java b/app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java index ba67bd736..991f2426d 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java @@ -10,6 +10,7 @@ import android.os.StrictMode; import android.text.TextUtils; import android.util.Log; import android.webkit.MimeTypeMap; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.data.Apk; diff --git a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java index a60c804d4..026209c05 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java @@ -29,8 +29,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.IBinder; import android.os.RemoteException; -import androidx.annotation.NonNull; import android.util.Log; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -40,6 +40,8 @@ import org.fdroid.fdroid.privileged.IPrivilegedService; import java.util.HashMap; +import androidx.annotation.NonNull; + /** * Installer that only works if the "F-Droid Privileged * Extension" is installed as a privileged app. diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java index 7b1fc8041..7853d5276 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.nearby; import android.bluetooth.BluetoothSocket; + import org.fdroid.fdroid.Utils; import java.io.BufferedInputStream; diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java index 09fb39b95..7b09575ae 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.nearby.httpish; import android.util.Log; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.nearby.BluetoothConnection; diff --git a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java index 32eee69ae..2e7f4f4e8 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java @@ -1,8 +1,8 @@ package org.fdroid.fdroid.net; import android.net.Uri; -import androidx.annotation.Nullable; import android.util.Log; + import org.apache.commons.io.input.BoundedInputStream; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.nearby.BluetoothClient; @@ -16,6 +16,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.regex.Pattern; +import androidx.annotation.Nullable; + /** * Download from a Bluetooth swap repo. Example URI: * {@code bluetooth://84-CF-BF-8B-3E-34/fdroid/repo} diff --git a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java b/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java index 6919c5c85..cfa1d074a 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java +++ b/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java @@ -7,13 +7,10 @@ import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.core.app.JobIntentService; -import androidx.core.content.ContextCompat; -import androidx.core.net.ConnectivityManagerCompat; - import android.util.Log; + import com.nostra13.universalimageloader.core.ImageLoader; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; @@ -23,6 +20,11 @@ import java.net.NetworkInterface; import java.net.SocketException; import java.util.Enumeration; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; +import androidx.core.content.ContextCompat; +import androidx.core.net.ConnectivityManagerCompat; + /** * An {@link JobIntentService} subclass for tracking whether there is metered or * unmetered internet available, based on diff --git a/app/src/main/java/org/fdroid/fdroid/net/Downloader.java b/app/src/main/java/org/fdroid/fdroid/net/Downloader.java index 11c7320f9..c1e10259b 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/Downloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/Downloader.java @@ -2,7 +2,7 @@ package org.fdroid.fdroid.net; import android.net.Uri; import android.text.format.DateUtils; -import androidx.annotation.NonNull; + import org.fdroid.fdroid.ProgressListener; import org.fdroid.fdroid.Utils; @@ -15,6 +15,8 @@ import java.net.ConnectException; import java.util.Timer; import java.util.TimerTask; +import androidx.annotation.NonNull; + public abstract class Downloader { private static final String TAG = "Downloader"; diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java index 1ef905b62..6f5a21ada 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java +++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java @@ -3,6 +3,7 @@ package org.fdroid.fdroid.net; import android.content.ContentResolver; import android.content.Context; import android.net.Uri; + import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.data.Schema; diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java index 315875407..ec023414c 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java +++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java @@ -29,10 +29,10 @@ import android.os.Looper; import android.os.Message; import android.os.PatternMatcher; import android.os.Process; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; import android.util.LogPrinter; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.ProgressListener; @@ -42,10 +42,6 @@ import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.data.SanitizedFile; import org.fdroid.fdroid.installer.ApkCache; -import javax.net.ssl.SSLHandshakeException; -import javax.net.ssl.SSLKeyException; -import javax.net.ssl.SSLPeerUnverifiedException; -import javax.net.ssl.SSLProtocolException; import java.io.File; import java.io.IOException; import java.net.ConnectException; @@ -55,6 +51,13 @@ import java.net.ProtocolException; import java.net.SocketTimeoutException; import java.net.UnknownHostException; +import javax.net.ssl.SSLHandshakeException; +import javax.net.ssl.SSLKeyException; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.net.ssl.SSLProtocolException; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * DownloaderService is a service that handles asynchronous download requests * (expressed as {@link Intent}s) on demand. Clients send download requests diff --git a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java index 8400f7cc6..4c2705954 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java @@ -26,7 +26,7 @@ import android.net.Uri; import android.os.Build; import android.text.TextUtils; import android.util.Base64; -import info.guardianproject.netcipher.NetCipher; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Utils; @@ -41,6 +41,8 @@ import java.net.MalformedURLException; import java.net.SocketTimeoutException; import java.net.URL; +import info.guardianproject.netcipher.NetCipher; + /** * Download files over HTTP, with support for proxies, {@code .onion} addresses, * HTTP Basic Auth, etc. This is not a full HTTP client! This is only using diff --git a/app/src/main/java/org/fdroid/fdroid/net/ImageLoaderForUIL.java b/app/src/main/java/org/fdroid/fdroid/net/ImageLoaderForUIL.java index 1bd8d60a6..eebf71885 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/ImageLoaderForUIL.java +++ b/app/src/main/java/org/fdroid/fdroid/net/ImageLoaderForUIL.java @@ -2,6 +2,7 @@ package org.fdroid.fdroid.net; import android.content.Context; import android.os.Build; + import com.nostra13.universalimageloader.core.download.BaseImageDownloader; import java.io.IOException; diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java index 0cd4d943a..b07665b21 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.net; import android.net.Uri; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java index 9f750ff04..058b61c98 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java @@ -3,7 +3,7 @@ package org.fdroid.fdroid.net; import android.annotation.TargetApi; import android.content.Context; import android.net.Uri; -import androidx.documentfile.provider.DocumentFile; + import org.fdroid.fdroid.FDroidApp; import java.io.BufferedInputStream; @@ -14,6 +14,8 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.ProtocolException; +import androidx.documentfile.provider.DocumentFile; + /** * An {@link Downloader} subclass for downloading files from a repo on a * removable storage device like an SD Card or USB OTG thumb drive using the diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java index 5e080e69f..7b8395ace 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; + import org.fdroid.fdroid.data.Apk; /** diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index 6798e2b79..758511269 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -42,10 +42,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.appcompat.app.AlertDialog; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; - import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -59,6 +55,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; + /** * This class contains the SecurityPermissions view implementation. * Initially the package's advanced or dangerous security permissions diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java index b204348b7..308ee0312 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java @@ -33,10 +33,6 @@ import android.widget.ImageView; import android.widget.TabHost; import android.widget.TextView; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.ViewPager; - import com.nostra13.universalimageloader.core.ImageLoader; import org.fdroid.fdroid.FDroidApp; @@ -48,6 +44,10 @@ import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.Schema; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.ViewPager; + /** * NOTES: * Parts are based on AOSP src/com/android/packageinstaller/PackageInstallerActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java index 14315b32d..0124ce06a 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java @@ -17,12 +17,8 @@ package org.fdroid.fdroid.privileged.views; -import androidx.appcompat.app.AppCompatActivity; import android.content.Context; import android.graphics.Rect; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; import android.view.View; import android.view.ViewGroup; import android.widget.TabHost; @@ -31,6 +27,11 @@ import android.widget.TabWidget; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + /** * This is a helper class that implements the management of tabs and all * details of connecting a ViewPager with associated TabHost. It relies on a diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java index e390b5106..e3f9b587a 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java @@ -19,15 +19,11 @@ package org.fdroid.fdroid.privileged.views; -import androidx.appcompat.app.AppCompatActivity; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.FragmentActivity; -import androidx.appcompat.app.AlertDialog; import android.view.ContextThemeWrapper; import org.fdroid.fdroid.FDroidApp; @@ -35,6 +31,11 @@ import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.installer.Installer; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentActivity; + /** * This class provides the confirmation prompt for when the user chooses to * uninstall an app. This has to be implemented here for the privileged diff --git a/app/src/main/java/org/fdroid/fdroid/qr/QrGenAsyncTask.java b/app/src/main/java/org/fdroid/fdroid/qr/QrGenAsyncTask.java index bf82979c8..98cb414ab 100644 --- a/app/src/main/java/org/fdroid/fdroid/qr/QrGenAsyncTask.java +++ b/app/src/main/java/org/fdroid/fdroid/qr/QrGenAsyncTask.java @@ -1,19 +1,22 @@ package org.fdroid.fdroid.qr; import android.annotation.TargetApi; -import androidx.appcompat.app.AppCompatActivity; import android.graphics.Bitmap; import android.graphics.Point; import android.os.AsyncTask; import android.util.Log; import android.view.Display; import android.widget.ImageView; + import com.google.zxing.BarcodeFormat; import com.google.zxing.WriterException; import com.google.zxing.encode.Contents; import com.google.zxing.encode.QRCodeEncoder; + import org.fdroid.fdroid.Utils; +import androidx.appcompat.app.AppCompatActivity; + public class QrGenAsyncTask extends AsyncTask { private static final String TAG = "QrGenAsyncTask"; diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/PackageManagerReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/PackageManagerReceiver.java index bfa16480b..b528f38d5 100644 --- a/app/src/main/java/org/fdroid/fdroid/receiver/PackageManagerReceiver.java +++ b/app/src/main/java/org/fdroid/fdroid/receiver/PackageManagerReceiver.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; import android.util.Log; + import org.fdroid.fdroid.data.InstalledAppProviderService; /** diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java index d13ef7582..b640098bc 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java @@ -42,15 +42,6 @@ import android.view.MenuItem; import android.view.ViewTreeObserver; import android.widget.Toast; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.google.android.material.appbar.MaterialToolbar; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; @@ -74,6 +65,15 @@ import org.fdroid.fdroid.views.apps.FeatureImage; import java.util.Iterator; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class AppDetailsActivity extends AppCompatActivity implements ShareChooserDialog.ShareChooserDialogListener, AppDetailsRecyclerViewAdapter.AppDetailsRecyclerViewAdapterCallbacks { diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 7d58bcc86..a19483892 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -30,23 +30,7 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.DrawableRes; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.core.content.ContextCompat; -import androidx.core.content.FileProvider; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.os.ConfigurationCompat; -import androidx.core.os.LocaleListCompat; -import androidx.core.text.HtmlCompat; -import androidx.core.text.util.LinkifyCompat; -import androidx.core.view.ViewCompat; -import androidx.core.widget.TextViewCompat; -import androidx.gridlayout.widget.GridLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.RecyclerView; + import org.apache.commons.io.FilenameUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -68,6 +52,24 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; +import androidx.annotation.DrawableRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.os.ConfigurationCompat; +import androidx.core.os.LocaleListCompat; +import androidx.core.text.HtmlCompat; +import androidx.core.text.util.LinkifyCompat; +import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; +import androidx.gridlayout.widget.GridLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; + @SuppressWarnings("LineLength") public class AppDetailsRecyclerViewAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/fdroid/fdroid/views/BannerUpdatingRepos.java b/app/src/main/java/org/fdroid/fdroid/views/BannerUpdatingRepos.java index 4597d9786..eacf581b7 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/BannerUpdatingRepos.java +++ b/app/src/main/java/org/fdroid/fdroid/views/BannerUpdatingRepos.java @@ -4,13 +4,15 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Widget which reflects whether or not a repo update is currently in progress or not. If so, shows * some sort of feedback to the user. diff --git a/app/src/main/java/org/fdroid/fdroid/views/FixAppBarLayoutBehavior.java b/app/src/main/java/org/fdroid/fdroid/views/FixAppBarLayoutBehavior.java index 07d9aff0b..981b9777c 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/FixAppBarLayoutBehavior.java +++ b/app/src/main/java/org/fdroid/fdroid/views/FixAppBarLayoutBehavior.java @@ -17,12 +17,14 @@ package org.fdroid.fdroid.views; import android.content.Context; -import com.google.android.material.appbar.AppBarLayout; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; +import com.google.android.material.appbar.AppBarLayout; + +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.view.ViewCompat; + /** * Workaround AppBarLayout.Behavior for https://issuetracker.google.com/66996774 * Source: https://gist.github.com/chrisbanes/8391b5adb9ee42180893300850ed02f2 diff --git a/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java b/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java index f04980912..d8b62a8cf 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java @@ -28,14 +28,12 @@ import android.os.ParcelFileDescriptor; import android.view.Menu; import android.view.MenuItem; import android.widget.TextView; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.app.ShareCompat; -import org.apache.commons.io.IOUtils; -import org.fdroid.fdroid.Preferences; import com.google.android.material.appbar.MaterialToolbar; +import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.FDroidApp; +import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; @@ -47,6 +45,9 @@ import java.io.FileInputStream; import java.io.IOException; import java.nio.charset.Charset; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ShareCompat; + public class InstallHistoryActivity extends AppCompatActivity { public static final String TAG = "InstallHistoryActivity"; diff --git a/app/src/main/java/org/fdroid/fdroid/views/LinearLayoutManagerSnapHelper.java b/app/src/main/java/org/fdroid/fdroid/views/LinearLayoutManagerSnapHelper.java index 476fad3c0..5edc578cf 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/LinearLayoutManagerSnapHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/views/LinearLayoutManagerSnapHelper.java @@ -1,11 +1,12 @@ package org.fdroid.fdroid.views; +import android.view.View; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearSnapHelper; import androidx.recyclerview.widget.OrientationHelper; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; @SuppressWarnings("LineLength") public class LinearLayoutManagerSnapHelper extends LinearSnapHelper { diff --git a/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java b/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java index 7ee68b404..71de9be12 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java +++ b/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java @@ -1,14 +1,16 @@ package org.fdroid.fdroid.views; import android.content.Context; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SeekBarPreference; import android.util.AttributeSet; import android.view.View; import android.widget.SeekBar; import android.widget.TextView; + import org.fdroid.fdroid.R; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SeekBarPreference; + public class LiveSeekBarPreference extends SeekBarPreference { private SeekBarLiveUpdater seekBarLiveUpdater; private boolean trackingTouch; diff --git a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java index 087ac9d91..e2ff996c9 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java @@ -50,17 +50,6 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; -import androidx.core.app.NavUtils; -import androidx.core.app.TaskStackBuilder; -import androidx.core.content.ContextCompat; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; - import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -86,6 +75,17 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Locale; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.NavUtils; +import androidx.core.app.TaskStackBuilder; +import androidx.core.content.ContextCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + public class ManageReposActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks, RepoAdapter.EnabledListener { private static final String TAG = "ManageReposActivity"; diff --git a/app/src/main/java/org/fdroid/fdroid/views/OverscrollLinearLayoutManager.java b/app/src/main/java/org/fdroid/fdroid/views/OverscrollLinearLayoutManager.java index c0de8cc03..972446364 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/OverscrollLinearLayoutManager.java +++ b/app/src/main/java/org/fdroid/fdroid/views/OverscrollLinearLayoutManager.java @@ -1,9 +1,10 @@ package org.fdroid.fdroid.views; import android.content.Context; +import android.util.AttributeSet; + import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.util.AttributeSet; /** * This class is like a standard LinearLayoutManager but with an option to add an diff --git a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java index 586be1b5c..ec2f37e73 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java @@ -35,22 +35,8 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.View; import android.view.WindowManager; -import android.widget.Toast; import android.widget.TextView; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.preference.CheckBoxPreference; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceGroup; -import androidx.preference.SeekBarPreference; -import androidx.preference.SwitchPreferenceCompat; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.RecyclerView; -import info.guardianproject.netcipher.proxy.OrbotHelper; +import android.widget.Toast; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -66,6 +52,20 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller; import org.fdroid.fdroid.work.CleanCacheWorker; import org.fdroid.fdroid.work.FDroidMetricsWorker; +import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.CheckBoxPreference; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceGroup; +import androidx.preference.SeekBarPreference; +import androidx.preference.SwitchPreferenceCompat; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; +import info.guardianproject.netcipher.proxy.OrbotHelper; + public class PreferencesFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { public static final String TAG = "PreferencesFragment"; diff --git a/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java index 0b54aca18..cf7077ffb 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java @@ -2,16 +2,18 @@ package org.fdroid.fdroid.views; import android.content.Context; import android.database.Cursor; -import androidx.cursoradapter.widget.CursorAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.TextView; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.compat.CursorAdapterCompat; import org.fdroid.fdroid.data.Repo; +import androidx.cursoradapter.widget.CursorAdapter; + public class RepoAdapter extends CursorAdapter { public interface EnabledListener { diff --git a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java index 7651940e8..94b83b92b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java @@ -26,15 +26,6 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.app.NavUtils; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.google.android.material.appbar.MaterialToolbar; import org.fdroid.fdroid.FDroidApp; @@ -52,6 +43,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Locale; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.NavUtils; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class RepoDetailsActivity extends AppCompatActivity { private static final String TAG = "RepoDetailsActivity"; diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java index f45d54d3a..1df595993 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java @@ -4,19 +4,14 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; + import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -24,6 +19,14 @@ import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; + /** * Full screen view of an apps screenshots to swipe through. This will always * download the image, even if the user has said not to use "unmetered" networks, diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java index a9910cb87..f3ac4e871 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java @@ -1,18 +1,21 @@ package org.fdroid.fdroid.views; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; + import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.App; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + /** * Loads and displays the small screenshots that are inline in {@link AppDetailsActivity} */ diff --git a/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java b/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java index 7326bbaee..fcd483a51 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java +++ b/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java @@ -6,11 +6,11 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.util.AttributeSet; +import org.fdroid.fdroid.R; + import androidx.appcompat.widget.AppCompatSeekBar; import androidx.core.content.ContextCompat; -import org.fdroid.fdroid.R; - /** * SeekBar that does not show the TickMark above the thumb * Based on https://stackoverflow.com/a/47727128 diff --git a/app/src/main/java/org/fdroid/fdroid/views/ShareChooserDialog.java b/app/src/main/java/org/fdroid/fdroid/views/ShareChooserDialog.java index a2edf75c9..4ab630df8 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ShareChooserDialog.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ShareChooserDialog.java @@ -8,18 +8,14 @@ import android.content.pm.ResolveInfo; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.bottomsheet.BottomSheetDialogFragment; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; + +import com.google.android.material.bottomsheet.BottomSheetDialogFragment; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; @@ -27,6 +23,13 @@ import org.fdroid.fdroid.Utils; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class ShareChooserDialog extends BottomSheetDialogFragment { private static final String ARG_WIDTH = "width"; private static final String ARG_INTENT = "intent"; diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java b/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java index 2ca27b39d..8bf16473d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java @@ -28,6 +28,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.data.App; + import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,9 +38,6 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.data.App; - public class AntiFeaturesListingView extends RecyclerView { public AntiFeaturesListingView(Context context, @Nullable AttributeSet attrs) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java index 5dba40495..6d90edf14 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java @@ -35,6 +35,16 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; + +import com.nostra13.universalimageloader.core.ImageLoader; + +import org.fdroid.fdroid.FDroidApp; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.Utils; +import org.fdroid.fdroid.data.AppProvider; +import org.fdroid.fdroid.data.Schema.AppMetadataTable; +import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; @@ -45,13 +55,6 @@ import androidx.loader.content.CursorLoader; import androidx.loader.content.Loader; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.nostra13.universalimageloader.core.ImageLoader; -import org.fdroid.fdroid.FDroidApp; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.data.AppProvider; -import org.fdroid.fdroid.data.Schema.AppMetadataTable; -import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; /** * Provides scrollable listing of apps for search and category views. diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java index e54f5ead7..e8581c0e0 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java @@ -1,14 +1,16 @@ package org.fdroid.fdroid.views.apps; -import androidx.appcompat.app.AppCompatActivity; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.Schema; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + class AppListAdapter extends RecyclerView.Adapter { private Cursor cursor; diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java index 9cb587ecb..88d978db2 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java @@ -1,7 +1,6 @@ package org.fdroid.fdroid.views.apps; import android.annotation.TargetApi; -import androidx.appcompat.app.AppCompatActivity; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -21,14 +20,6 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.content.ContextCompat; -import androidx.core.util.Pair; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.recyclerview.widget.RecyclerView; - import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus; import org.fdroid.fdroid.Preferences; @@ -48,6 +39,15 @@ import java.io.File; import java.util.Iterator; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.content.ContextCompat; +import androidx.core.util.Pair; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Supports the following layouts: *
    diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemDivider.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemDivider.java index 182445715..b927e88d3 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemDivider.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemDivider.java @@ -2,14 +2,15 @@ package org.fdroid.fdroid.views.apps; import android.content.Context; import android.graphics.Rect; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.RecyclerView; + /** * Draws a faint line between items, to be used with the {@link AppListItemDivider}. */ diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java index c97f4e2a5..14465e891 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java @@ -1,9 +1,10 @@ package org.fdroid.fdroid.views.apps; +import org.fdroid.fdroid.Utils; +import org.fdroid.fdroid.data.App; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.data.App; /** * A dumb model which is used to specify what should/should not be shown in an {@link AppListItemController}. diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java b/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java index f4a092a85..a73158c67 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java @@ -6,12 +6,14 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.RectF; import android.graphics.drawable.Drawable; +import android.text.style.ReplacementSpan; + +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.views.categories.CategoryController; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import android.text.style.ReplacementSpan; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.views.categories.CategoryController; /** * This draws a category "chip" in the search text view according to the material design specs diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/CategoryTextWatcher.java b/app/src/main/java/org/fdroid/fdroid/views/apps/CategoryTextWatcher.java index 5565e61ce..e55592913 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/CategoryTextWatcher.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/CategoryTextWatcher.java @@ -3,15 +3,17 @@ package org.fdroid.fdroid.views.apps; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.Editable; import android.text.Spanned; import android.text.TextWatcher; import android.text.style.TtsSpan; import android.widget.EditText; + import org.fdroid.fdroid.R; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * The search input treats text before the first colon as a category name. Text after this colon * (or all text if there is no colon) is the free text search terms. diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java b/app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java index ebcfebd26..758012d29 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java @@ -9,23 +9,26 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.Point; import android.graphics.PorterDuff; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.palette.graphics.Palette; -import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; + import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; + import org.fdroid.fdroid.R; import java.util.Random; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; +import androidx.core.content.ContextCompat; +import androidx.palette.graphics.Palette; + /** * A feature image can have a {@link android.graphics.drawable.Drawable} or a {@link Palette}. If * a Drawable is available, then it will draw that, otherwise it will attempt to fall back to the diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java index 4fefe433c..86dc0f15b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java @@ -1,13 +1,15 @@ package org.fdroid.fdroid.views.apps; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.View; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + /** * Used for search results or for category lists. * Shows an inline download button, and also (if appropriate): diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java index 138427e6f..9232b13bb 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java @@ -5,6 +5,12 @@ import android.os.Bundle; import android.view.View; import android.widget.ImageView; import android.widget.TextView; + +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.Utils; +import org.fdroid.fdroid.data.App; +import org.fdroid.fdroid.views.AppDetailsActivity; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; @@ -13,10 +19,6 @@ import androidx.core.content.ContextCompat; import androidx.core.util.Pair; import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.RecyclerView; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.data.App; -import org.fdroid.fdroid.views.AppDetailsActivity; /** * The {@link AppCardController} can bind an app to several different layouts, as long as the layout diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java index 6d4541809..f60fed026 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java @@ -1,14 +1,15 @@ package org.fdroid.fdroid.views.categories; -import androidx.appcompat.app.AppCompatActivity; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + class AppPreviewAdapter extends RecyclerView.Adapter { private Cursor cursor; diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java index 8ddc35c41..41d9cf161 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java @@ -1,16 +1,17 @@ package org.fdroid.fdroid.views.categories; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.loader.app.LoaderManager; -import androidx.recyclerview.widget.ListAdapter; -import androidx.recyclerview.widget.DiffUtil; import android.view.ViewGroup; import org.fdroid.fdroid.R; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.loader.app.LoaderManager; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.ListAdapter; + public class CategoryAdapter extends ListAdapter { private final AppCompatActivity activity; diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java index a0c2ffe94..f63b053f8 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java @@ -11,18 +11,11 @@ import android.view.View; import android.widget.Button; import android.widget.FrameLayout; import android.widget.TextView; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.content.ContextCompat; -import androidx.core.view.ViewCompat; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.recyclerview.widget.RecyclerView; + import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.AppProvider; @@ -34,6 +27,16 @@ import org.fdroid.fdroid.views.apps.FeatureImage; import java.util.Locale; import java.util.Random; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.core.view.ViewCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.RecyclerView; + public class CategoryController extends RecyclerView.ViewHolder implements LoaderManager.LoaderCallbacks { private final Button viewAll; private final TextView heading; diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java index cb806b575..675701588 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java @@ -1,16 +1,18 @@ package org.fdroid.fdroid.views.installed; -import androidx.appcompat.app.AppCompatActivity; import android.database.Cursor; import android.provider.BaseColumns; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + public class InstalledAppListAdapter extends RecyclerView.Adapter { protected final AppCompatActivity activity; diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java index ccaacdf46..482cd633b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java @@ -1,8 +1,5 @@ package org.fdroid.fdroid.views.installed; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.View; import org.fdroid.fdroid.AppUpdateStatusManager; @@ -12,6 +9,10 @@ import org.fdroid.fdroid.data.AppPrefs; import org.fdroid.fdroid.views.apps.AppListItemController; import org.fdroid.fdroid.views.apps.AppListItemState; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + /** * Shows the currently installed version name, and whether or not it is the recommended version. * Also shows whether the user has previously asked to ignore updates for this app entirely, or for diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java index 55e51f55e..a741ba0c3 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java @@ -26,6 +26,14 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; +import com.google.android.material.appbar.MaterialToolbar; + +import org.fdroid.fdroid.FDroidApp; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.data.App; +import org.fdroid.fdroid.data.AppProvider; +import org.fdroid.fdroid.data.Schema; + import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ShareCompat; @@ -35,14 +43,6 @@ import androidx.loader.content.Loader; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.google.android.material.appbar.MaterialToolbar; - -import org.fdroid.fdroid.FDroidApp; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.data.App; -import org.fdroid.fdroid.data.AppProvider; -import org.fdroid.fdroid.data.Schema; - public class InstalledAppsActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private InstalledAppListAdapter adapter; diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java index d6ec7baf5..8d3557ab0 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java @@ -1,21 +1,23 @@ package org.fdroid.fdroid.views.main; -import androidx.appcompat.app.AppCompatActivity; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.graphics.Rect; -import androidx.annotation.NonNull; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.views.categories.AppCardController; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class LatestAdapter extends RecyclerView.Adapter { private Cursor cursor; diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java index 685136b84..fe29c52e2 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java @@ -8,15 +8,9 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.google.android.material.floatingactionbutton.FloatingActionButton; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; @@ -32,6 +26,15 @@ import org.fdroid.fdroid.views.categories.AppCardController; import java.util.Date; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + /** * Loads a list of newly added or recently updated apps and displays them to the user. */ diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java index 6820d3dc2..d7b9d6dd4 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java @@ -37,17 +37,11 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.app.AppCompatDelegate; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; + import com.ashokvarma.bottomnavigation.BottomNavigationBar; import com.ashokvarma.bottomnavigation.BottomNavigationItem; import com.ashokvarma.bottomnavigation.TextBadgeItem; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus; import org.fdroid.fdroid.BuildConfig; @@ -69,6 +63,15 @@ import org.fdroid.fdroid.views.apps.AppListActivity; import java.lang.reflect.Field; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Main view shown to users upon starting F-Droid. *

    diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java index 2500aac22..17b8d57fc 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java @@ -26,10 +26,12 @@ import android.view.Menu; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.PopupMenu; + +import org.fdroid.fdroid.R; + import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.RecyclerView; -import org.fdroid.fdroid.R; /** * Represents the main views that are accessible from the main screen via each diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java b/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java index 91cc7d1b9..4a277fe3e 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java @@ -4,11 +4,13 @@ import android.annotation.TargetApi; import android.content.Context; import android.util.AttributeSet; import android.widget.FrameLayout; + +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.views.PreferencesFragment; + import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.views.PreferencesFragment; /** * When attached to the window, the {@link PreferencesFragment} will be added. When detached from diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java index 491da272e..49361819e 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java @@ -7,15 +7,10 @@ import android.content.IntentFilter; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; + import com.hannesdorfmann.adapterdelegates3.AdapterDelegatesManager; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; @@ -33,6 +28,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Manages the following types of information: *

      diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java index d3cc3c7ac..0710b8fcc 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java @@ -1,13 +1,13 @@ package org.fdroid.fdroid.views.updates; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; - import org.fdroid.fdroid.views.apps.AppListItemController; import org.fdroid.fdroid.views.updates.items.AppStatusListItemController; import org.fdroid.fdroid.views.updates.items.KnownVulnAppListItemController; import org.fdroid.fdroid.views.updates.items.UpdateableAppListItemController; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + /** * Certain views within the {@link UpdatesAdapter} can be swiped to dismiss. Depending on which item is swiped, there * is a different behaviour, but all of it revolves around dismissing the item. diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java index 5d114a7c6..a87f81ac8 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java @@ -4,21 +4,23 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.Utils; +import androidx.appcompat.app.AppCompatActivity; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + public class UpdatesViewBinder { private final UpdatesAdapter adapter; diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java index 86e64de76..83c42ea0f 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java @@ -1,16 +1,19 @@ package org.fdroid.fdroid.views.updates.items; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; + import com.hannesdorfmann.adapterdelegates3.AdapterDelegate; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + /** * Apps which we want to show some more substantial information about. * diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java index bcec7e308..034067ab1 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java @@ -1,11 +1,9 @@ package org.fdroid.fdroid.views.updates.items; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.snackbar.Snackbar; import android.view.View; +import com.google.android.material.snackbar.Snackbar; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus; import org.fdroid.fdroid.R; @@ -14,6 +12,10 @@ import org.fdroid.fdroid.views.apps.AppListItemController; import org.fdroid.fdroid.views.apps.AppListItemState; import org.fdroid.fdroid.views.updates.UpdatesAdapter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + /** * Shows apps which are: * * In the process of being downloaded. diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java index 1342fd6eb..8885eb489 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java @@ -1,8 +1,5 @@ package org.fdroid.fdroid.views.updates.items; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.hannesdorfmann.adapterdelegates3.AdapterDelegate; @@ -12,6 +9,10 @@ import org.fdroid.fdroid.data.App; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + /** * List of all apps which can be updated, but have not yet been downloaded. * diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java index 88ca2e9f4..84242fc9e 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java @@ -1,16 +1,13 @@ package org.fdroid.fdroid.views.updates.items; -import androidx.appcompat.app.AppCompatActivity; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.snackbar.Snackbar; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.view.View; +import com.google.android.material.snackbar.Snackbar; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.Apk; @@ -26,6 +23,11 @@ import org.fdroid.fdroid.views.apps.AppListItemController; import org.fdroid.fdroid.views.apps.AppListItemState; import org.fdroid.fdroid.views.updates.UpdatesAdapter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Tell the user that an app they have installed has a known vulnerability. * The role of this controller is to prompt the user what it is that should be done in response to this diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java index bbb0c354e..25272d4a3 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java @@ -1,15 +1,18 @@ package org.fdroid.fdroid.views.updates.items; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; + import com.hannesdorfmann.adapterdelegates3.AdapterDelegate; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + /** * List of all apps which can be updated, but have not yet been downloaded. * diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java index 67d9f2a9f..2731dc12b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java @@ -1,11 +1,9 @@ package org.fdroid.fdroid.views.updates.items; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.snackbar.Snackbar; import android.view.View; +import com.google.android.material.snackbar.Snackbar; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; @@ -15,6 +13,10 @@ import org.fdroid.fdroid.views.apps.AppListItemController; import org.fdroid.fdroid.views.apps.AppListItemState; import org.fdroid.fdroid.views.updates.UpdatesAdapter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + /** * Very trimmed down list item. Only displays the app icon, name, and a download button. * We don't even need to show download progress, because the intention is that as soon as diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java index ba8f8aab8..2c5fd7ad0 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java @@ -1,15 +1,14 @@ package org.fdroid.fdroid.views.updates.items; -import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; + import com.hannesdorfmann.adapterdelegates3.AdapterDelegate; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.views.updates.UpdatesAdapter; @@ -17,6 +16,10 @@ import org.fdroid.fdroid.views.updates.UpdatesAdapter; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + /** * Summary of all apps that can be downloaded. Includes a button to download all of them and also * a toggle to show or hide the list of each individual item. diff --git a/app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java b/app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java index 584b01afa..dafedf0ee 100644 --- a/app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java +++ b/app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java @@ -6,16 +6,7 @@ import android.os.Process; import android.system.ErrnoException; import android.system.Os; import android.system.StructStat; -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; -import androidx.work.Constraints; -import androidx.work.ExistingPeriodicWorkPolicy; -import androidx.work.ExistingWorkPolicy; -import androidx.work.OneTimeWorkRequest; -import androidx.work.PeriodicWorkRequest; -import androidx.work.WorkManager; -import androidx.work.Worker; -import androidx.work.WorkerParameters; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Utils; @@ -27,6 +18,17 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; +import androidx.work.Constraints; +import androidx.work.ExistingPeriodicWorkPolicy; +import androidx.work.ExistingWorkPolicy; +import androidx.work.OneTimeWorkRequest; +import androidx.work.PeriodicWorkRequest; +import androidx.work.WorkManager; +import androidx.work.Worker; +import androidx.work.WorkerParameters; + /** * Deletes the built-up cruft left over from various processes. *

      diff --git a/app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java b/app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java index 434f16649..ed5f9125d 100644 --- a/app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java +++ b/app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java @@ -24,20 +24,14 @@ import android.content.pm.PackageManager; import android.os.Build; import android.text.TextUtils; import android.text.format.DateUtils; -import androidx.annotation.NonNull; -import androidx.work.Constraints; -import androidx.work.ExistingPeriodicWorkPolicy; -import androidx.work.ListenableWorker; -import androidx.work.PeriodicWorkRequest; -import androidx.work.WorkManager; -import androidx.work.Worker; -import androidx.work.WorkerParameters; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Utils; @@ -63,6 +57,15 @@ import java.util.Objects; import java.util.Random; import java.util.concurrent.TimeUnit; +import androidx.annotation.NonNull; +import androidx.work.Constraints; +import androidx.work.ExistingPeriodicWorkPolicy; +import androidx.work.ListenableWorker; +import androidx.work.PeriodicWorkRequest; +import androidx.work.WorkManager; +import androidx.work.Worker; +import androidx.work.WorkerParameters; + /** * This gathers all the information needed for F-Droid Metrics, aka the * "Popularity Contest", and submits it to the Clean Insights Matomo. This diff --git a/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java b/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java index ff95a4002..903d07bd3 100644 --- a/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java +++ b/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java @@ -2,6 +2,7 @@ package org.fdroid.fdroid; import android.app.Application; import android.content.ContentValues; + import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.App; diff --git a/app/src/test/java/org/fdroid/fdroid/Assert.java b/app/src/test/java/org/fdroid/fdroid/Assert.java index d6ca06d03..7260fc45e 100644 --- a/app/src/test/java/org/fdroid/fdroid/Assert.java +++ b/app/src/test/java/org/fdroid/fdroid/Assert.java @@ -5,7 +5,9 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.Uri; + import junit.framework.AssertionFailedError; + import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; diff --git a/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java b/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java index 32b2db8b0..500f1a6b5 100644 --- a/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java +++ b/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java @@ -20,10 +20,8 @@ package org.fdroid.fdroid; import android.content.Context; import android.content.SharedPreferences; -import androidx.preference.PreferenceManager; -import androidx.test.core.app.ApplicationProvider; - import android.util.Log; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,9 @@ import org.robolectric.shadows.ShadowLog; import java.util.Map; +import androidx.preference.PreferenceManager; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; diff --git a/app/src/test/java/org/fdroid/fdroid/TestUtils.java b/app/src/test/java/org/fdroid/fdroid/TestUtils.java index 478c8ca1f..1a8864fe9 100644 --- a/app/src/test/java/org/fdroid/fdroid/TestUtils.java +++ b/app/src/test/java/org/fdroid/fdroid/TestUtils.java @@ -7,7 +7,7 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.pm.ProviderInfo; import android.net.Uri; -import androidx.test.core.app.ApplicationProvider; + import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; @@ -30,6 +30,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.security.NoSuchAlgorithmException; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java index 518d63dba..bc9fde44f 100644 --- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java @@ -4,7 +4,7 @@ package org.fdroid.fdroid; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.Signature; -import androidx.test.core.app.ApplicationProvider; + import org.fdroid.fdroid.views.AppDetailsRecyclerViewAdapter; import org.junit.Test; import org.junit.runner.RunWith; @@ -15,6 +15,8 @@ import java.util.Date; import java.util.Random; import java.util.TimeZone; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java index be8e6ec01..233317d0d 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java @@ -4,6 +4,7 @@ import android.app.Application; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; + import org.fdroid.fdroid.Assert; import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.Utils; diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkTest.java b/app/src/test/java/org/fdroid/fdroid/data/ApkTest.java index 93c5124c1..14abad308 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ApkTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ApkTest.java @@ -3,7 +3,7 @@ package org.fdroid.fdroid.data; import android.content.ContextWrapper; import android.os.Environment; import android.webkit.MimeTypeMap; -import androidx.test.core.app.ApplicationProvider; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.installer.ApkCache; import org.junit.Before; @@ -17,6 +17,8 @@ import org.robolectric.shadows.ShadowMimeTypeMap; import java.io.File; import java.io.IOException; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java index 36c9bb24e..89b537146 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.data; import android.app.Application; + import org.fdroid.fdroid.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java index 4053410ed..d133cdbd8 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java @@ -6,6 +6,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.Uri; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; diff --git a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java index 6f71026ab..06d967e9c 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java @@ -5,6 +5,7 @@ import android.content.ContentResolver; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; + import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; import org.fdroid.fdroid.mock.MockRepo; diff --git a/app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java b/app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java index 27cdda382..aa4353e4a 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java @@ -4,8 +4,6 @@ import android.content.Context; import android.text.TextUtils; import android.util.Log; -import androidx.test.core.app.ApplicationProvider; - import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.R; import org.fdroid.fdroid.TestUtils; @@ -23,6 +21,8 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java b/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java index c9bfa704c..a4dd7466e 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java +++ b/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java @@ -7,7 +7,7 @@ import android.content.Context; import android.content.ContextWrapper; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import androidx.test.core.app.ApplicationProvider; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.Utils; @@ -19,6 +19,8 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ContentProviderController; import org.robolectric.annotation.Config; +import androidx.test.core.app.ApplicationProvider; + @Config(application = Application.class) @RunWith(RobolectricTestRunner.class) public class DatabaseMigration { diff --git a/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java index eda3d6646..453516417 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java @@ -3,12 +3,14 @@ package org.fdroid.fdroid.data; import android.content.ContentResolver; import android.content.ContentValues; import android.content.ContextWrapper; -import androidx.test.core.app.ApplicationProvider; + import org.fdroid.fdroid.TestUtils; import org.junit.After; import org.junit.Before; import org.robolectric.android.controller.ContentProviderController; +import androidx.test.core.app.ApplicationProvider; + public abstract class FDroidProviderTest { // NOPMD This abstract class does not have any abstract methods protected ContentResolver contentResolver; diff --git a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java index 3ec3ee186..b755aed8d 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java @@ -5,8 +5,6 @@ import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; -import androidx.test.core.app.ApplicationProvider; - import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Schema.InstalledAppTable.Cols; @@ -18,6 +16,8 @@ import org.robolectric.annotation.Config; import java.util.Map; +import androidx.test.core.app.ApplicationProvider; + import static org.fdroid.fdroid.Assert.assertIsInstalledVersionInDb; import static org.fdroid.fdroid.Assert.assertResultCount; import static org.junit.Assert.assertEquals; diff --git a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppTestUtils.java b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppTestUtils.java index f0cfd70be..a5da14fa5 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppTestUtils.java +++ b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppTestUtils.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.Signature; + import androidx.annotation.Nullable; public class InstalledAppTestUtils { diff --git a/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java b/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java index 1c096766d..048f4e1b8 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java @@ -1,8 +1,9 @@ package org.fdroid.fdroid.data; import android.os.Build; -import androidx.core.os.LocaleListCompat; + import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.TestUtils; import org.junit.Assume; @@ -19,6 +20,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import androidx.core.os.LocaleListCompat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java b/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java index fe5ba6573..5992bf290 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java @@ -2,6 +2,7 @@ package org.fdroid.fdroid.data; import android.app.Application; import android.content.Context; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.TestUtils; import org.junit.Before; diff --git a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java index 12950b026..afbce774e 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java @@ -2,8 +2,6 @@ package org.fdroid.fdroid.data; import android.content.ContentResolver; -import androidx.test.core.app.ApplicationProvider; - import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Schema.InstalledAppTable; import org.fdroid.fdroid.mock.MockApk; @@ -16,6 +14,8 @@ import org.robolectric.RobolectricTestRunner; import java.util.ArrayList; import java.util.List; +import androidx.test.core.app.ApplicationProvider; + import static org.fdroid.fdroid.Assert.assertInvalidUri; import static org.fdroid.fdroid.Assert.assertValidUri; diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java index 5e4eae6e6..6487e3663 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java @@ -25,7 +25,6 @@ import android.app.Application; import android.content.ContentValues; import android.content.Context; import android.net.Uri; -import androidx.annotation.Nullable; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; @@ -40,6 +39,8 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; +import androidx.annotation.Nullable; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java index 71f02c8de..f2bc36461 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java @@ -25,8 +25,6 @@ package org.fdroid.fdroid.data; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; - import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.mock.MockRepo; import org.fdroid.fdroid.mock.RepoDetails; @@ -52,6 +50,8 @@ import java.util.TimeZone; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import androidx.annotation.NonNull; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java b/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java index c5dfd2f7c..c12e8b57a 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.data; import android.app.Application; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; diff --git a/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java b/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java index 1069e0d6d..1bb07de08 100644 --- a/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java +++ b/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java @@ -2,7 +2,7 @@ package org.fdroid.fdroid.installer; import android.content.ContextWrapper; import android.util.Log; -import androidx.test.core.app.ApplicationProvider; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -11,6 +11,8 @@ import org.robolectric.shadows.ShadowLog; import java.io.File; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java b/app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java index aa2b5d09e..3512d32fe 100644 --- a/app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java @@ -1,7 +1,7 @@ package org.fdroid.fdroid.installer; import android.content.ContextWrapper; -import androidx.test.core.app.ApplicationProvider; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.data.Apk; import org.junit.Before; @@ -10,6 +10,8 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowLog; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java b/app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java index a455fd57d..cca65c351 100644 --- a/app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java +++ b/app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java @@ -1,7 +1,7 @@ package org.fdroid.fdroid.installer; import android.content.ContextWrapper; -import androidx.test.core.app.ApplicationProvider; + import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.data.Apk; import org.junit.Before; @@ -9,6 +9,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; @RunWith(RobolectricTestRunner.class) diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java index 532b735db..7ae827096 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java @@ -3,8 +3,6 @@ package org.fdroid.fdroid.updater; import android.content.ContentValues; import android.util.Log; -import androidx.annotation.NonNull; - import org.fdroid.fdroid.IndexUpdater.UpdateException; import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; @@ -15,6 +13,8 @@ import org.robolectric.RobolectricTestRunner; import java.util.List; +import androidx.annotation.NonNull; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java index ce90823b1..18a30a8d1 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java @@ -1,8 +1,8 @@ package org.fdroid.fdroid.updater; -import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; + import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; + import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.IndexV1Updater; @@ -48,6 +49,8 @@ import java.util.TreeSet; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import androidx.annotation.NonNull; + import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertArrayEquals; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java index d815fbe7f..371b7feea 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java @@ -2,7 +2,6 @@ package org.fdroid.fdroid.updater; import android.content.ContentValues; import android.content.Context; -import androidx.annotation.NonNull; import android.text.TextUtils; import org.fdroid.fdroid.IndexUpdater; @@ -27,6 +26,8 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import androidx.annotation.NonNull; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java index db0f9e7da..bb6be90a5 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java @@ -1,8 +1,8 @@ package org.fdroid.fdroid.updater; import android.content.ContentValues; -import androidx.annotation.StringDef; import android.util.Log; + import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Apk; @@ -29,6 +29,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import androidx.annotation.StringDef; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java index 5f1824f18..a46f50be1 100644 --- a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java @@ -6,10 +6,6 @@ import android.content.Context; import android.view.LayoutInflater; import android.view.ViewGroup; -import androidx.appcompat.view.ContextThemeWrapper; -import androidx.recyclerview.widget.RecyclerView; -import androidx.test.core.app.ApplicationProvider; - import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; @@ -30,6 +26,10 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; @Config(application = Application.class) diff --git a/app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java b/app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java index 97783d7f7..3b859f7be 100644 --- a/app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java @@ -1,7 +1,7 @@ package org.fdroid.fdroid.work; import android.content.Context; -import androidx.test.core.app.ApplicationProvider; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.nearby.LocalRepoManager; @@ -16,6 +16,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java b/app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java index 619296b66..aadaaca22 100644 --- a/app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java @@ -3,7 +3,7 @@ package org.fdroid.fdroid.work; import android.app.Application; import android.content.ContextWrapper; import android.text.format.DateUtils; -import androidx.test.core.app.ApplicationProvider; + import org.apache.commons.io.FileUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.TestUtils; @@ -20,6 +20,8 @@ import java.io.IOException; import java.text.ParseException; import java.util.Collection; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; diff --git a/app/src/testFull/java/org/fdroid/fdroid/data/ShadowApp.java b/app/src/testFull/java/org/fdroid/fdroid/data/ShadowApp.java index a9534989f..d4e8c36a0 100644 --- a/app/src/testFull/java/org/fdroid/fdroid/data/ShadowApp.java +++ b/app/src/testFull/java/org/fdroid/fdroid/data/ShadowApp.java @@ -1,6 +1,7 @@ package org.fdroid.fdroid.data; import android.content.Context; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java index 897080aa4..50acd18a2 100644 --- a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java +++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java @@ -2,8 +2,6 @@ package org.fdroid.fdroid.nearby; import android.content.Context; -import androidx.test.core.app.ApplicationProvider; - import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Utils; import org.junit.Test; @@ -14,6 +12,8 @@ import org.robolectric.shadows.ShadowLog; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java index d08264ce2..fbd0e9170 100644 --- a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java +++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java @@ -36,8 +36,6 @@ package org.fdroid.fdroid.nearby; import android.content.Context; import android.text.TextUtils; -import androidx.test.core.app.ApplicationProvider; - import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.Utils; @@ -59,6 +57,8 @@ import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.URL; +import androidx.test.core.app.ApplicationProvider; + import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java index 8681ddbe9..acd050f7f 100644 --- a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java +++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java @@ -3,8 +3,6 @@ package org.fdroid.fdroid.nearby; import android.content.Context; import android.text.TextUtils; -import androidx.test.core.app.ApplicationProvider; - import org.apache.commons.io.IOUtils; import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.Utils; @@ -22,6 +20,8 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java b/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java index 8f83fce73..e6abe538a 100644 --- a/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java +++ b/app/src/testFull/java/org/fdroid/fdroid/updater/SwapRepoTest.java @@ -8,8 +8,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.text.TextUtils; -import androidx.test.core.app.ApplicationProvider; - import org.apache.commons.net.util.SubnetUtils; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Hasher; @@ -45,6 +43,8 @@ import java.io.IOException; import java.security.cert.Certificate; import java.util.List; +import androidx.test.core.app.ApplicationProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; diff --git a/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java b/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java index 4231126c1..6614300d1 100644 --- a/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java +++ b/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java @@ -1,11 +1,9 @@ package org.fdroid.fdroid.mock; -import androidx.annotation.NonNull; - -import org.fdroid.fdroid.data.RepoXMLHandler; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.RepoPushRequest; +import org.fdroid.fdroid.data.RepoXMLHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -20,6 +18,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import androidx.annotation.NonNull; + import static org.junit.Assert.fail; public class RepoDetails implements RepoXMLHandler.IndexReceiver {