diff --git a/src/org/kde/kdeconnect/Backends/BaseLink.java b/src/org/kde/kdeconnect/Backends/BaseLink.java index 93c570b4..6d036eb2 100644 --- a/src/org/kde/kdeconnect/Backends/BaseLink.java +++ b/src/org/kde/kdeconnect/Backends/BaseLink.java @@ -8,14 +8,14 @@ package org.kde.kdeconnect.Backends; import android.content.Context; +import androidx.annotation.WorkerThread; + import org.kde.kdeconnect.Device; import org.kde.kdeconnect.NetworkPacket; import java.security.PrivateKey; import java.util.ArrayList; -import androidx.annotation.WorkerThread; - public abstract class BaseLink { diff --git a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java index 92c5dfa0..df1e8ec5 100644 --- a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java +++ b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java @@ -6,7 +6,6 @@ package org.kde.kdeconnect.Backends.BluetoothBackend; -import android.annotation.TargetApi; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothServerSocket; @@ -15,7 +14,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.os.Build; import android.os.Parcelable; import android.util.Log; diff --git a/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java b/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java index 92ccc722..4ab638a0 100644 --- a/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java +++ b/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java @@ -8,14 +8,14 @@ package org.kde.kdeconnect.Backends.LoopbackBackend; import android.content.Context; +import androidx.annotation.WorkerThread; + import org.kde.kdeconnect.Backends.BaseLink; import org.kde.kdeconnect.Backends.BaseLinkProvider; import org.kde.kdeconnect.Backends.BasePairingHandler; import org.kde.kdeconnect.Device; import org.kde.kdeconnect.NetworkPacket; -import androidx.annotation.WorkerThread; - public class LoopbackLink extends BaseLink { public LoopbackLink(Context context, BaseLinkProvider linkProvider) { diff --git a/src/org/kde/kdeconnect/Helpers/ContactsHelper.java b/src/org/kde/kdeconnect/Helpers/ContactsHelper.java index ef4bb291..fda6f712 100644 --- a/src/org/kde/kdeconnect/Helpers/ContactsHelper.java +++ b/src/org/kde/kdeconnect/Helpers/ContactsHelper.java @@ -7,11 +7,9 @@ package org.kde.kdeconnect.Helpers; -import android.annotation.TargetApi; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.os.Build; import android.provider.ContactsContract; import android.provider.ContactsContract.PhoneLookup; import android.util.Base64; @@ -20,7 +18,6 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -43,7 +40,6 @@ public class ContactsHelper { /** * Lookup the name and photoID of a contact given a phone number */ - @TargetApi(Build.VERSION_CODES.HONEYCOMB) public static Map phoneNumberLookup(Context context, String number) { Map contactInfo = new HashMap<>(); @@ -160,10 +156,7 @@ public class ContactsHelper { } final List lines = IOUtils.readLines(input, Charsets.UTF_8); toReturn.put(ID, new VCardBuilder(StringUtils.join(lines, '\n'))); - } catch (IOException e) { - // If you are experiencing this, please open a bug report indicating how you got here - Log.e("Contacts", "Exception while fetching vcards", e); - } catch (NullPointerException e) { + } catch (IOException | NullPointerException e) { // If you are experiencing this, please open a bug report indicating how you got here Log.e("Contacts", "Exception while fetching vcards", e); } diff --git a/src/org/kde/kdeconnect/Helpers/IntentHelper.java b/src/org/kde/kdeconnect/Helpers/IntentHelper.java index d4298238..312c885e 100644 --- a/src/org/kde/kdeconnect/Helpers/IntentHelper.java +++ b/src/org/kde/kdeconnect/Helpers/IntentHelper.java @@ -12,12 +12,12 @@ import android.content.Context; import android.content.Intent; import android.os.Build; -import org.kde.kdeconnect.MyApplication; -import org.kde.kdeconnect_tp.R; - import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; +import org.kde.kdeconnect.MyApplication; +import org.kde.kdeconnect_tp.R; + public class IntentHelper { /** diff --git a/src/org/kde/kdeconnect/Helpers/StorageHelper.java b/src/org/kde/kdeconnect/Helpers/StorageHelper.java index 3642adb6..e808e685 100644 --- a/src/org/kde/kdeconnect/Helpers/StorageHelper.java +++ b/src/org/kde/kdeconnect/Helpers/StorageHelper.java @@ -6,10 +6,8 @@ package org.kde.kdeconnect.Helpers; -import android.annotation.TargetApi; import android.content.Context; import android.net.Uri; -import android.os.Build; import android.os.Environment; import android.provider.DocumentsContract; import android.util.Log; diff --git a/src/org/kde/kdeconnect/Helpers/ThreadHelper.kt b/src/org/kde/kdeconnect/Helpers/ThreadHelper.kt index 81a115ae..1a35eaa4 100644 --- a/src/org/kde/kdeconnect/Helpers/ThreadHelper.kt +++ b/src/org/kde/kdeconnect/Helpers/ThreadHelper.kt @@ -1,7 +1,5 @@ package org.kde.kdeconnect.Helpers -import android.os.Handler -import android.os.Looper import java.util.concurrent.ExecutorService import java.util.concurrent.Executors diff --git a/src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java b/src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java index 7d4f5a65..6409939c 100644 --- a/src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java @@ -11,6 +11,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/src/org/kde/kdeconnect/Plugins/BigscreenPlugin/BigscreenPlugin.java b/src/org/kde/kdeconnect/Plugins/BigscreenPlugin/BigscreenPlugin.java index 75517713..0443aa77 100644 --- a/src/org/kde/kdeconnect/Plugins/BigscreenPlugin/BigscreenPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/BigscreenPlugin/BigscreenPlugin.java @@ -8,6 +8,8 @@ package org.kde.kdeconnect.Plugins.BigscreenPlugin; +import static org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView.SpecialKeysMap; + import android.Manifest; import android.app.Activity; import android.content.Context; @@ -15,16 +17,14 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.view.KeyEvent; +import androidx.core.content.ContextCompat; + import org.kde.kdeconnect.Device; import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect_tp.R; -import androidx.core.content.ContextCompat; - -import static org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView.SpecialKeysMap; - @PluginFactory.LoadablePlugin public class BigscreenPlugin extends Plugin { diff --git a/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java index 22fef6fe..a6f8859d 100644 --- a/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java +++ b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java @@ -8,7 +8,6 @@ package org.kde.kdeconnect.Plugins.ClibpoardPlugin; import android.Manifest; -import android.annotation.TargetApi; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; @@ -29,7 +28,6 @@ import java.util.Date; import java.util.HashSet; import java.util.Locale; -@TargetApi(Build.VERSION_CODES.HONEYCOMB) public class ClipboardListener { public interface ClipboardObserver { diff --git a/src/org/kde/kdeconnect/Plugins/ContactsPlugin/ContactsPlugin.java b/src/org/kde/kdeconnect/Plugins/ContactsPlugin/ContactsPlugin.java index 9c3a6916..378b8d29 100644 --- a/src/org/kde/kdeconnect/Plugins/ContactsPlugin/ContactsPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/ContactsPlugin/ContactsPlugin.java @@ -10,14 +10,12 @@ package org.kde.kdeconnect.Plugins.ContactsPlugin; import android.Manifest; -import android.annotation.TargetApi; -import android.os.Build; import android.util.Log; import org.kde.kdeconnect.Helpers.ContactsHelper; +import org.kde.kdeconnect.Helpers.ContactsHelper.ContactNotFoundException; import org.kde.kdeconnect.Helpers.ContactsHelper.VCardBuilder; import org.kde.kdeconnect.Helpers.ContactsHelper.uID; -import org.kde.kdeconnect.Helpers.ContactsHelper.ContactNotFoundException; import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; diff --git a/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneSettingsFragment.java b/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneSettingsFragment.java index 334ac52f..218ca81e 100644 --- a/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneSettingsFragment.java +++ b/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneSettingsFragment.java @@ -14,13 +14,13 @@ import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; -import org.kde.kdeconnect_tp.R; - import androidx.annotation.NonNull; import androidx.preference.Preference; import androidx.preference.PreferenceManager; +import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; +import org.kde.kdeconnect_tp.R; + public class FindMyPhoneSettingsFragment extends PluginSettingsFragment { private static final int REQUEST_CODE_SELECT_RINGTONE = 1000; diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/ComposeSendActivity.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/ComposeSendActivity.java index 53e8fdeb..ab555d66 100644 --- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/ComposeSendActivity.java +++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/ComposeSendActivity.java @@ -7,26 +7,24 @@ package org.kde.kdeconnect.Plugins.MousePadPlugin; -import androidx.appcompat.app.AppCompatActivity; - import android.content.Intent; - import android.os.Bundle; import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import android.view.inputmethod.EditorInfo; +import android.widget.EditText; +import android.widget.TextView; + +import androidx.appcompat.app.AppCompatActivity; import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.UserInterface.ThemeUtil; import org.kde.kdeconnect_tp.R; -import android.view.inputmethod.EditorInfo; -import android.widget.EditText; -import android.widget.TextView; - import java.util.Objects; diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java index ae7dd5a2..ce3ad212 100644 --- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java +++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java @@ -8,7 +8,6 @@ package org.kde.kdeconnect.Plugins.MousePadPlugin; import android.content.Intent; import android.content.SharedPreferences; -import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.view.GestureDetector; diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java index 1c386a3f..08619ebc 100644 --- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java @@ -11,14 +11,14 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; +import androidx.core.content.ContextCompat; + import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; import org.kde.kdeconnect_tp.R; -import androidx.core.content.ContextCompat; - @PluginFactory.LoadablePlugin public class MousePadPlugin extends Plugin { diff --git a/src/org/kde/kdeconnect/Plugins/MprisPlugin/AlbumArtCache.kt b/src/org/kde/kdeconnect/Plugins/MprisPlugin/AlbumArtCache.kt index 53f13a77..e16a90b1 100644 --- a/src/org/kde/kdeconnect/Plugins/MprisPlugin/AlbumArtCache.kt +++ b/src/org/kde/kdeconnect/Plugins/MprisPlugin/AlbumArtCache.kt @@ -28,7 +28,6 @@ import java.net.MalformedURLException import java.net.URL import java.net.URLDecoder import java.security.MessageDigest -import java.util.* /** * Handles the cache for album art diff --git a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisMediaSession.java b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisMediaSession.java index 8f047527..520653c4 100644 --- a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisMediaSession.java +++ b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisMediaSession.java @@ -24,6 +24,12 @@ import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.PlaybackStateCompat; import android.util.Pair; +import androidx.annotation.NonNull; +import androidx.core.app.NotificationCompat; +import androidx.core.app.TaskStackBuilder; +import androidx.core.content.ContextCompat; +import androidx.media.app.NotificationCompat.MediaStyle; + import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Helpers.NotificationHelper; @@ -34,13 +40,6 @@ import org.kde.kdeconnect_tp.R; import java.util.HashSet; -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; -import androidx.core.app.NotificationCompat; -import androidx.core.app.TaskStackBuilder; -import androidx.core.content.ContextCompat; -import androidx.media.app.NotificationCompat.MediaStyle; - /** * Controls the mpris media control notification *

diff --git a/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlayer.java b/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlayer.java index c6ae8559..cb543311 100644 --- a/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlayer.java +++ b/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverPlayer.java @@ -6,15 +6,12 @@ package org.kde.kdeconnect.Plugins.MprisReceiverPlugin; +import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.firstNonEmpty; + import android.media.MediaMetadata; import android.media.session.MediaController; import android.media.session.PlaybackState; -import android.os.Build; - -import androidx.annotation.RequiresApi; - -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.firstNonEmpty; class MprisReceiverPlayer { diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java index 7a7108a8..8ec2e379 100644 --- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java +++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java @@ -26,14 +26,14 @@ import android.widget.CheckedTextView; import android.widget.CompoundButton; import android.widget.ListView; -import org.kde.kdeconnect.Helpers.ThreadHelper; -import org.kde.kdeconnect.UserInterface.ThemeUtil; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.core.widget.TextViewCompat; import com.google.android.material.switchmaterial.SwitchMaterial; +import org.kde.kdeconnect.Helpers.ThreadHelper; +import org.kde.kdeconnect.UserInterface.ThemeUtil; import org.kde.kdeconnect_tp.R; import org.kde.kdeconnect_tp.databinding.ActivityNotificationFilterBinding; diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java index 6e79e27d..3feab59c 100644 --- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java +++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java @@ -9,7 +9,6 @@ package org.kde.kdeconnect.Plugins.NotificationsPlugin; import android.app.Service; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; @@ -17,8 +16,6 @@ import java.util.ArrayList; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import androidx.annotation.RequiresApi; - public class NotificationReceiver extends NotificationListenerService { private boolean connected; diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java index b7b5f071..9e024c98 100644 --- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java @@ -6,7 +6,6 @@ package org.kde.kdeconnect.Plugins.NotificationsPlugin; -import android.annotation.TargetApi; import android.app.Activity; import android.app.KeyguardManager; import android.app.Notification; diff --git a/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java b/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java index 6e2f4029..4fc4ca53 100644 --- a/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java @@ -11,14 +11,14 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.net.Uri; +import androidx.core.content.ContextCompat; + import org.kde.kdeconnect.Helpers.FilesHelper; import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect_tp.R; -import androidx.core.content.ContextCompat; - @PluginFactory.LoadablePlugin public class PhotoPlugin extends Plugin { diff --git a/src/org/kde/kdeconnect/Plugins/Plugin.java b/src/org/kde/kdeconnect/Plugins/Plugin.java index f700da7c..3f5a2ddb 100644 --- a/src/org/kde/kdeconnect/Plugins/Plugin.java +++ b/src/org/kde/kdeconnect/Plugins/Plugin.java @@ -6,7 +6,6 @@ package org.kde.kdeconnect.Plugins; -import android.Manifest; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; diff --git a/src/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/org/kde/kdeconnect/Plugins/PluginFactory.java index c09e9f38..22fb7261 100644 --- a/src/org/kde/kdeconnect/Plugins/PluginFactory.java +++ b/src/org/kde/kdeconnect/Plugins/PluginFactory.java @@ -6,6 +6,9 @@ package org.kde.kdeconnect.Plugins; +import static org.apache.commons.collections4.SetUtils.emptyIfNull; +import static org.apache.commons.collections4.SetUtils.unmodifiableSet; + import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Log; @@ -20,9 +23,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.commons.collections4.SetUtils.emptyIfNull; -import static org.apache.commons.collections4.SetUtils.unmodifiableSet; - public class PluginFactory { @IndexAnnotated diff --git a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java index 394092a7..9c7dad9e 100644 --- a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java +++ b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java @@ -10,7 +10,6 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; -import android.os.Build; import android.os.Bundle; import android.os.PowerManager; import android.support.v4.media.session.MediaSessionCompat; diff --git a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java index 15dbd32c..53211fad 100644 --- a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java @@ -7,6 +7,8 @@ package org.kde.kdeconnect.Plugins.PresenterPlugin; +import static org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView.SpecialKeysMap; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -21,8 +23,6 @@ import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect_tp.R; -import static org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView.SpecialKeysMap; - @PluginFactory.LoadablePlugin public class PresenterPlugin extends Plugin { diff --git a/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java b/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java index 2b7654ba..9ebc996f 100644 --- a/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java @@ -21,21 +21,21 @@ import android.view.inputmethod.ExtractedText; import android.view.inputmethod.ExtractedTextRequest; import android.view.inputmethod.InputConnection; +import androidx.core.content.ContextCompat; +import androidx.core.util.Pair; +import androidx.fragment.app.DialogFragment; + import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect.UserInterface.MainActivity; -import org.kde.kdeconnect.UserInterface.StartActivityAlertDialogFragment; import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; +import org.kde.kdeconnect.UserInterface.StartActivityAlertDialogFragment; import org.kde.kdeconnect_tp.R; import java.util.ArrayList; import java.util.concurrent.locks.ReentrantLock; -import androidx.core.content.ContextCompat; -import androidx.core.util.Pair; -import androidx.fragment.app.DialogFragment; - @PluginFactory.LoadablePlugin public class RemoteKeyboardPlugin extends Plugin implements SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java index 721762ea..0ee2fae5 100644 --- a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java @@ -15,6 +15,9 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.util.Log; +import androidx.core.content.ContextCompat; +import androidx.preference.PreferenceManager; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -28,9 +31,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.Iterator; -import androidx.core.content.ContextCompat; -import androidx.preference.PreferenceManager; - @PluginFactory.LoadablePlugin public class RunCommandPlugin extends Plugin { diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandUrlActivity.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandUrlActivity.java index 937804e0..2b813e82 100644 --- a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandUrlActivity.java +++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandUrlActivity.java @@ -7,14 +7,14 @@ import android.util.Log; import android.view.Gravity; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.Device; import org.kde.kdeconnect.UserInterface.ThemeUtil; import org.kde.kdeconnect_tp.R; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; - public class RunCommandUrlActivity extends AppCompatActivity { @Override diff --git a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java index f2b7ea8f..2a7bd797 100644 --- a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java @@ -8,9 +8,11 @@ package org.kde.kdeconnect.Plugins.SMSPlugin; -import android.app.Activity; +import static org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin.PACKET_TYPE_TELEPHONY; + import android.Manifest; import android.annotation.SuppressLint; +import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -28,6 +30,11 @@ import android.telephony.PhoneNumberUtils; import android.telephony.SmsManager; import android.telephony.SmsMessage; +import androidx.core.content.ContextCompat; + +import com.klinker.android.logger.Log; +import com.klinker.android.send_message.Transaction; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -48,14 +55,6 @@ import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import androidx.core.content.ContextCompat; - -import com.klinker.android.send_message.ApnUtils; -import com.klinker.android.send_message.Transaction; -import com.klinker.android.logger.Log; - -import static org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin.PACKET_TYPE_TELEPHONY; - @PluginFactory.LoadablePlugin @SuppressLint("InlinedApi") public class SMSPlugin extends Plugin { diff --git a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SmsMmsUtils.java b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SmsMmsUtils.java index 469e06f3..a05c0073 100644 --- a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SmsMmsUtils.java +++ b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SmsMmsUtils.java @@ -8,11 +8,24 @@ package org.kde.kdeconnect.Plugins.SMSPlugin; import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.provider.Telephony; +import android.telephony.SmsManager; +import android.text.TextUtils; +import android.util.Base64; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import com.android.mms.dom.smil.parser.SmilXmlSerializer; import com.google.android.mms.ContentType; @@ -33,22 +46,8 @@ import com.klinker.android.send_message.Settings; import com.klinker.android.send_message.Transaction; import com.klinker.android.send_message.Utils; -import android.content.ContentUris; -import android.content.ContentValues; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.provider.Telephony; -import android.net.Uri; -import android.telephony.SmsManager; -import android.text.TextUtils; -import android.util.Base64; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; import org.kde.kdeconnect.Helpers.SMSHelper; import org.kde.kdeconnect.Helpers.TelephonyHelper; import org.kde.kdeconnect.NetworkPacket; diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidFileSystemFactory.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidFileSystemFactory.java index de0f8c5f..b8d9a12e 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidFileSystemFactory.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidFileSystemFactory.java @@ -7,7 +7,6 @@ package org.kde.kdeconnect.Plugins.SftpPlugin; import android.content.Context; -import android.os.Build; import org.apache.sshd.common.Session; import org.apache.sshd.common.file.FileSystemFactory; diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafFileSystemView.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafFileSystemView.java index 9441e7da..33f13f9e 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafFileSystemView.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafFileSystemView.java @@ -6,7 +6,6 @@ package org.kde.kdeconnect.Plugins.SftpPlugin; -import android.annotation.TargetApi; import android.content.Context; import android.net.Uri; import android.provider.DocumentsContract; @@ -20,7 +19,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -@TargetApi(21) public class AndroidSafFileSystemView implements FileSystemView { final String userName; final Context context; diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafSshFile.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafSshFile.java index 593fc5df..747174ba 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafSshFile.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/AndroidSafSshFile.java @@ -6,7 +6,6 @@ package org.kde.kdeconnect.Plugins.SftpPlugin; -import android.annotation.TargetApi; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -37,7 +36,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -@TargetApi(21) public class AndroidSafSshFile implements SshFile { private static final String TAG = AndroidSafSshFile.class.getSimpleName(); diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java index f436c690..c6beffe6 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java @@ -10,7 +10,6 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.SharedPreferences; import android.net.Uri; -import android.os.Build; import android.util.Log; import androidx.annotation.NonNull; @@ -25,7 +24,6 @@ import org.kde.kdeconnect.UserInterface.DeviceSettingsAlertDialogFragment; import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; import org.kde.kdeconnect_tp.R; -import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java index b8d8824b..f45143bb 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java @@ -6,16 +6,13 @@ package org.kde.kdeconnect.Plugins.SftpPlugin; -import android.annotation.TargetApi; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.TypedArray; import android.graphics.PorterDuff; import android.net.Uri; -import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.util.Log; import android.util.SparseBooleanArray; import android.view.Menu; @@ -35,13 +32,11 @@ import org.json.JSONException; import org.json.JSONObject; import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.Device; -import org.kde.kdeconnect.Helpers.StorageHelper; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.UserInterface.PluginSettingsActivity; import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; import org.kde.kdeconnect_tp.R; -import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/StoragePreferenceDialogFragment.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/StoragePreferenceDialogFragment.java index 1eab2343..573110e3 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/StoragePreferenceDialogFragment.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/StoragePreferenceDialogFragment.java @@ -1,6 +1,5 @@ package org.kde.kdeconnect.Plugins.SftpPlugin; -import android.annotation.TargetApi; import android.app.Activity; import android.app.Dialog; import android.content.Intent; diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java index b3147006..179a5328 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java @@ -9,6 +9,9 @@ package org.kde.kdeconnect.Plugins.SharePlugin; import android.os.Handler; import android.os.Looper; +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; + import org.kde.kdeconnect.Device; import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.async.BackgroundJob; @@ -17,9 +20,6 @@ import org.kde.kdeconnect_tp.R; import java.util.ArrayList; import java.util.List; -import androidx.annotation.GuardedBy; -import androidx.annotation.NonNull; - /** * A type of {@link BackgroundJob} that sends Files to another device. * diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java index 5cb0abf7..5fcb489c 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java @@ -10,19 +10,18 @@ import android.app.Activity; import android.content.ClipData; import android.content.Intent; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.util.Log; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.UserInterface.ThemeUtil; import org.kde.kdeconnect_tp.R; import java.util.ArrayList; -import androidx.appcompat.app.AppCompatActivity; - public class SendFileActivity extends AppCompatActivity { diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java index e433cab0..4391be25 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java @@ -6,7 +6,6 @@ package org.kde.kdeconnect.Plugins.SharePlugin; -import android.annotation.TargetApi; import android.content.ComponentName; import android.content.IntentFilter; import android.graphics.drawable.Icon; @@ -22,7 +21,6 @@ import org.kde.kdeconnect_tp.R; import java.util.ArrayList; import java.util.List; -@TargetApi(23) public class ShareChooserTargetService extends ChooserTargetService { @Override public List onGetChooserTargets(ComponentName targetActivityName, IntentFilter matchedFilter) { diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareInfo.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareInfo.java index 3f0edbe1..4af44a1f 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareInfo.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareInfo.java @@ -6,12 +6,12 @@ package org.kde.kdeconnect.Plugins.SharePlugin; +import androidx.documentfile.provider.DocumentFile; + import org.kde.kdeconnect.NetworkPacket; import java.io.OutputStream; -import androidx.documentfile.provider.DocumentFile; - class ShareInfo { String fileName; long fileSize; diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java index 3c59a1bf..f178b4c8 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java @@ -56,7 +56,7 @@ public class SharePlugin extends Plugin { final static String KEY_NUMBER_OF_FILES = "numberOfFiles"; final static String KEY_TOTAL_PAYLOAD_SIZE = "totalPayloadSize"; - private BackgroundJobHandler backgroundJobHandler; + private final BackgroundJobHandler backgroundJobHandler; private final Handler handler; private CompositeReceiveFileJob receiveFileJob; diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareSettingsFragment.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareSettingsFragment.java index 75eccdc2..e4e446d5 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareSettingsFragment.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareSettingsFragment.java @@ -6,27 +6,25 @@ package org.kde.kdeconnect.Plugins.SharePlugin; -import android.annotation.TargetApi; import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.util.Log; -import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; - -import java.io.File; - import androidx.annotation.NonNull; import androidx.documentfile.provider.DocumentFile; -import androidx.preference.SwitchPreferenceCompat; import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreferenceCompat; + +import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; + +import java.io.File; public class ShareSettingsFragment extends PluginSettingsFragment { diff --git a/src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java b/src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java index a8672f9d..d37d80ff 100644 --- a/src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java @@ -6,8 +6,8 @@ package org.kde.kdeconnect.Plugins.TelephonyPlugin; -import android.app.Activity; import android.Manifest; +import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -22,6 +22,8 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.core.content.ContextCompat; + import org.apache.commons.lang3.ArrayUtils; import org.kde.kdeconnect.Helpers.ContactsHelper; import org.kde.kdeconnect.NetworkPacket; @@ -34,8 +36,6 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import androidx.core.content.ContextCompat; - @PluginFactory.LoadablePlugin public class TelephonyPlugin extends Plugin { diff --git a/src/org/kde/kdeconnect/UserInterface/About/StringListAdapter.kt b/src/org/kde/kdeconnect/UserInterface/About/StringListAdapter.kt index 74b3ac56..15155fb4 100644 --- a/src/org/kde/kdeconnect/UserInterface/About/StringListAdapter.kt +++ b/src/org/kde/kdeconnect/UserInterface/About/StringListAdapter.kt @@ -6,9 +6,9 @@ package org.kde.kdeconnect.UserInterface.About -import android.widget.TextView import android.view.View import android.view.ViewGroup +import android.widget.TextView import androidx.core.view.setPadding import androidx.recyclerview.widget.RecyclerView diff --git a/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java b/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java index 69f4086a..8a37c80a 100644 --- a/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java +++ b/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java @@ -7,20 +7,15 @@ package org.kde.kdeconnect.UserInterface; import android.graphics.Canvas; -import android.graphics.drawable.Drawable; -import android.os.Build; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.widget.TextViewCompat; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.RecyclerView; -import org.kde.kdeconnect_tp.R; import org.kde.kdeconnect_tp.databinding.CustomDeviceItemBinding; import java.util.ArrayList; diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java index 487bb42c..7b4b24c4 100644 --- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java @@ -15,7 +15,6 @@ import android.net.LinkProperties; import android.net.Network; import android.net.NetworkInfo; import android.net.NetworkRequest; -import android.os.Build; import android.os.Bundle; import android.provider.Settings; import android.view.LayoutInflater; diff --git a/src/org/kde/kdeconnect/UserInterface/PluginPreference.java b/src/org/kde/kdeconnect/UserInterface/PluginPreference.java index 2ce3755c..1a2f0096 100644 --- a/src/org/kde/kdeconnect/UserInterface/PluginPreference.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginPreference.java @@ -4,15 +4,15 @@ import android.content.Context; import android.util.TypedValue; import android.view.View; +import androidx.annotation.NonNull; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect_tp.R; -import androidx.annotation.NonNull; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - public class PluginPreference extends SwitchPreference { private final Device device; private final String pluginKey; diff --git a/src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java b/src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java index 798fc72c..c84f5374 100644 --- a/src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java @@ -9,15 +9,15 @@ package org.kde.kdeconnect.UserInterface; import android.os.Bundle; import android.view.MenuItem; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect_tp.R; -import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; - import java.util.Objects; public class PluginSettingsActivity diff --git a/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java index 03b2356f..9e767d77 100644 --- a/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java @@ -18,9 +18,6 @@ import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect_tp.R; -import android.util.Log; - -import java.util.Locale; public class PluginSettingsFragment extends PreferenceFragmentCompat { private static final String ARG_PLUGIN_KEY = "plugin_key"; diff --git a/src/org/kde/kdeconnect/UserInterface/PluginSettingsListFragment.java b/src/org/kde/kdeconnect/UserInterface/PluginSettingsListFragment.java index 1b7c45a3..fc77c159 100644 --- a/src/org/kde/kdeconnect/UserInterface/PluginSettingsListFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginSettingsListFragment.java @@ -9,18 +9,18 @@ package org.kde.kdeconnect.UserInterface; import android.os.Bundle; import android.os.Parcelable; -import org.kde.kdeconnect.BackgroundService; -import org.kde.kdeconnect.Device; -import org.kde.kdeconnect_tp.R; - -import java.util.List; - import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; +import org.kde.kdeconnect.BackgroundService; +import org.kde.kdeconnect.Device; +import org.kde.kdeconnect_tp.R; + +import java.util.List; + public class PluginSettingsListFragment extends PreferenceFragmentCompat { private static final String ARG_DEVICE_ID = "deviceId"; private static final String KEY_RECYCLERVIEW_LAYOUTMANAGER_STATE = "RecyclerViewLayoutmanagerState"; diff --git a/src/org/kde/kdeconnect/async/BackgroundJobHandler.java b/src/org/kde/kdeconnect/async/BackgroundJobHandler.java index 0dcb805e..8f0c3191 100644 --- a/src/org/kde/kdeconnect/async/BackgroundJobHandler.java +++ b/src/org/kde/kdeconnect/async/BackgroundJobHandler.java @@ -71,7 +71,7 @@ public class BackgroundJobHandler { } private final ThreadPoolExecutor threadPoolExecutor; - private Handler handler; + private final Handler handler; private BackgroundJobHandler(int corePoolSize, int maxPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue workQueue) { this.handler = new Handler(Looper.getMainLooper()); diff --git a/tests/org/kde/kdeconnect/DeviceTest.java b/tests/org/kde/kdeconnect/DeviceTest.java index b11c671f..14e30387 100644 --- a/tests/org/kde/kdeconnect/DeviceTest.java +++ b/tests/org/kde/kdeconnect/DeviceTest.java @@ -6,6 +6,16 @@ package org.kde.kdeconnect; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; + import android.app.NotificationManager; import android.content.Context; import android.content.SharedPreferences; @@ -34,16 +44,6 @@ import java.lang.reflect.Method; import java.security.KeyPair; import java.security.KeyPairGenerator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; - @RunWith(PowerMockRunner.class) @PrepareForTest({Base64.class, Log.class, PreferenceManager.class, ContextCompat.class}) public class DeviceTest { diff --git a/tests/org/kde/kdeconnect/MockSharedPreference.java b/tests/org/kde/kdeconnect/MockSharedPreference.java index 7ea9aac2..9a500618 100644 --- a/tests/org/kde/kdeconnect/MockSharedPreference.java +++ b/tests/org/kde/kdeconnect/MockSharedPreference.java @@ -2,12 +2,12 @@ package org.kde.kdeconnect; import android.content.SharedPreferences; +import androidx.annotation.Nullable; + import java.util.HashMap; import java.util.Map; import java.util.Set; -import androidx.annotation.Nullable; - /** * Mock implementation of shared preference, which just saves data in memory using map. diff --git a/tests/org/kde/kdeconnect/NetworkPacketTest.java b/tests/org/kde/kdeconnect/NetworkPacketTest.java index ec8cf5b3..4279f00e 100644 --- a/tests/org/kde/kdeconnect/NetworkPacketTest.java +++ b/tests/org/kde/kdeconnect/NetworkPacketTest.java @@ -6,6 +6,13 @@ package org.kde.kdeconnect; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; + import android.content.Context; import android.util.Log; @@ -19,13 +26,6 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; - @RunWith(PowerMockRunner.class) @PrepareForTest({DeviceHelper.class, Log.class}) public class NetworkPacketTest {