diff --git a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java index df1e8ec5..a623fcee 100644 --- a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java +++ b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java @@ -43,7 +43,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider { private final Map visibleComputers = new HashMap<>(); private final Map sockets = new HashMap<>(); - private BluetoothAdapter bluetoothAdapter; + private final BluetoothAdapter bluetoothAdapter; private ServerRunnable serverRunnable; private ClientRunnable clientRunnable; diff --git a/src/org/kde/kdeconnect/Backends/BluetoothBackend/ConnectionMultiplexer.java b/src/org/kde/kdeconnect/Backends/BluetoothBackend/ConnectionMultiplexer.java index 4a1229b1..cf92f481 100644 --- a/src/org/kde/kdeconnect/Backends/BluetoothBackend/ConnectionMultiplexer.java +++ b/src/org/kde/kdeconnect/Backends/BluetoothBackend/ConnectionMultiplexer.java @@ -19,7 +19,7 @@ public final class ConnectionMultiplexer implements Closeable { private static final int BUFFER_SIZE = 4096; private static final class ChannelInputStream extends InputStream implements Closeable { - Channel channel; + final Channel channel; ChannelInputStream(Channel channel) { this.channel = channel; @@ -57,7 +57,7 @@ public final class ConnectionMultiplexer implements Closeable { } private static final class ChannelOutputStream extends OutputStream implements Closeable { - Channel channel; + final Channel channel; ChannelOutputStream(Channel channel) { this.channel = channel; @@ -92,9 +92,9 @@ public final class ConnectionMultiplexer implements Closeable { } private static final class Channel implements Closeable { - ConnectionMultiplexer multiplexer; - UUID id; - ByteBuffer read_buffer = ByteBuffer.allocate(BUFFER_SIZE); + final ConnectionMultiplexer multiplexer; + final UUID id; + final ByteBuffer read_buffer = ByteBuffer.allocate(BUFFER_SIZE); final Object lock = new Object(); boolean open = true; int requestedReadAmount = 0; //Number of times we requested some bytes from the channel @@ -199,7 +199,7 @@ public final class ConnectionMultiplexer implements Closeable { } private BluetoothSocket socket; - private Map channels = new HashMap<>(); + private final Map channels = new HashMap<>(); private final Object lock = new Object(); private boolean open = true; private boolean receivedProtocolVersion = false; diff --git a/src/org/kde/kdeconnect/DevicePacketQueue.java b/src/org/kde/kdeconnect/DevicePacketQueue.java index 7b04cbbd..995d04b4 100644 --- a/src/org/kde/kdeconnect/DevicePacketQueue.java +++ b/src/org/kde/kdeconnect/DevicePacketQueue.java @@ -17,7 +17,7 @@ class DevicePacketQueue { /** * Replacement ID: if positive, it can be replaced by later packets with the same ID */ - int replaceID; + final int replaceID; Device.SendPacketStatusCallback callback; Item(NetworkPacket packet, int replaceID, Device.SendPacketStatusCallback callback) { @@ -28,7 +28,7 @@ class DevicePacketQueue { } private final ArrayDeque items = new ArrayDeque<>(); - private Device mDevice; + private final Device mDevice; private final Object lock = new Object(); private boolean exit = false; diff --git a/src/org/kde/kdeconnect/Helpers/TelephonyHelper.java b/src/org/kde/kdeconnect/Helpers/TelephonyHelper.java index 70ceed02..05efb15a 100644 --- a/src/org/kde/kdeconnect/Helpers/TelephonyHelper.java +++ b/src/org/kde/kdeconnect/Helpers/TelephonyHelper.java @@ -360,7 +360,7 @@ public class TelephonyHelper { private int mmsProxyPort = 80; // Default port should be 80 according to code comment in Android's ApnSettings.java public static class Builder { - private org.kde.kdeconnect.Helpers.TelephonyHelper.ApnSetting internalApnSetting; + private final org.kde.kdeconnect.Helpers.TelephonyHelper.ApnSetting internalApnSetting; public Builder() { internalApnSetting = new ApnSetting(); diff --git a/src/org/kde/kdeconnect/NetworkPacket.java b/src/org/kde/kdeconnect/NetworkPacket.java index c2f47aba..6023dbc5 100644 --- a/src/org/kde/kdeconnect/NetworkPacket.java +++ b/src/org/kde/kdeconnect/NetworkPacket.java @@ -310,9 +310,9 @@ public class NetworkPacket { } public static class Payload { - private InputStream inputStream; - private Socket inputSocket; - private long payloadSize; + private final InputStream inputStream; + private final Socket inputSocket; + private final long payloadSize; public Payload(long payloadSize) { this((InputStream)null, payloadSize); diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java index 672f014f..319b4781 100644 --- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java +++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadGestureDetector.java @@ -13,7 +13,7 @@ import android.view.ViewConfiguration; class MousePadGestureDetector { private static final int TAP_TIMEOUT = ViewConfiguration.getTapTimeout() + 100; - private OnGestureListener mGestureListener; + private final OnGestureListener mGestureListener; private long mFirstDownTime = 0; diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java index cf323fda..86dadc19 100644 --- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java +++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java @@ -43,9 +43,9 @@ class AppDatabase { + KEY_PRIVACY_OPTIONS + " INTEGER NOT NULL); "; - private SQLiteDatabase ourDatabase; - private DbHelper ourHelper; - private SharedPreferences prefs; + private final SQLiteDatabase ourDatabase; + private final DbHelper ourHelper; + private final SharedPreferences prefs; AppDatabase(Context context, boolean readonly) { ourHelper = new DbHelper(context); diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java index 9f2c0d71..3a86100a 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java @@ -36,7 +36,7 @@ public class SftpPlugin extends Plugin implements SharedPreferences.OnSharedPref private final static String PACKET_TYPE_SFTP = "kdeconnect.sftp"; private final static String PACKET_TYPE_SFTP_REQUEST = "kdeconnect.sftp.request"; - static int PREFERENCE_KEY_STORAGE_INFO_LIST = R.string.sftp_preference_key_storage_info_list; + static final int PREFERENCE_KEY_STORAGE_INFO_LIST = R.string.sftp_preference_key_storage_info_list; private static final SimpleSftpServer server = new SimpleSftpServer(); @@ -242,8 +242,10 @@ public class SftpPlugin extends Plugin implements SharedPreferences.OnSharedPref private static final String KEY_DISPLAY_NAME = "DisplayName"; private static final String KEY_URI = "Uri"; - @NonNull String displayName; - @NonNull Uri uri; + @NonNull + String displayName; + @NonNull + final Uri uri; StorageInfo(@NonNull String displayName, @NonNull Uri uri) { this.displayName = displayName; diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java index 179a5328..3b739119 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/CompositeUploadFileJob.java @@ -41,13 +41,13 @@ import java.util.List; */ public class CompositeUploadFileJob extends BackgroundJob { private boolean isRunning; - private Handler handler; + private final Handler handler; private String currentFileName; private int currentFileNum; private boolean updatePacketPending; private long totalSend; private int prevProgressPercentage; - private UploadNotification uploadNotification; + private final UploadNotification uploadNotification; private final Object lock; //Use to protect concurrent access to the variables below @GuardedBy("lock") diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java index 4d544584..c5b8945e 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java @@ -34,7 +34,7 @@ class ReceiveNotification { private final int notificationId; private NotificationCompat.Builder builder; private final Device device; - private long jobId; + private final long jobId; //https://documentation.onesignal.com/docs/android-customizations#section-big-picture private static final int bigImageWidth = 1440; diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java index c0d2a164..c6e363ae 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java @@ -25,7 +25,7 @@ class UploadNotification { private NotificationCompat.Builder builder; private final int notificationId; private final Device device; - private long jobId; + private final long jobId; UploadNotification(Device device, long jobId) { this.device = device; diff --git a/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/Sink.java b/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/Sink.java index 45ba9c3c..9e4ecd8d 100644 --- a/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/Sink.java +++ b/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/Sink.java @@ -21,10 +21,10 @@ class Sink { } private int volume; - private String description; - private String name; + private final String description; + private final String name; private boolean mute; - private int maxVolume; + private final int maxVolume; private boolean enabled; private final List listeners; diff --git a/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java b/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java index bd207a6b..00e42d02 100644 --- a/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java @@ -118,7 +118,7 @@ public class AlertDialogFragment extends DialogFragment implements DialogInterfa } public static abstract class AbstractBuilder, F extends DialogFragment> { - Bundle args; + final Bundle args; AbstractBuilder() { args = new Bundle(); diff --git a/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java b/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java index 8a37c80a..f448363a 100644 --- a/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java +++ b/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java @@ -88,7 +88,7 @@ public class CustomDevicesAdapter extends RecyclerView.Adapter implements Runnable { - private static AtomicLong atomicLong = new AtomicLong(0); + private static final AtomicLong atomicLong = new AtomicLong(0); protected volatile boolean canceled; private BackgroundJobHandler backgroundJobHandler; - private long id; + private final long id; - protected I requestInfo; - private Callback callback; + protected final I requestInfo; + private final Callback callback; public BackgroundJob(I requestInfo, Callback callback) { this.id = atomicLong.incrementAndGet();