From 96a83ddcd35a3ad049de994838ad076c1ea286be Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@kdab.com>
Date: Fri, 19 Apr 2019 01:09:52 +0200
Subject: [PATCH] Inline fields

---
 .../kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java | 2 --
 src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java | 2 --
 tests/org/kde/kdeconnect/LanLinkTest.java                      | 3 +--
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java
index dbc47592..14854318 100644
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java
@@ -39,7 +39,6 @@ class UploadNotification {
     private NotificationCompat.Builder builder;
     private final int notificationId;
     private final Device device;
-    private long currentJobId;
 
     UploadNotification(Device device) {
         this.device = device;
@@ -56,7 +55,6 @@ class UploadNotification {
     void addCancelAction(long jobId) {
         builder.mActions.clear();
 
-        currentJobId = jobId;
         Intent cancelIntent = new Intent(device.getContext(), ShareBroadcastReceiver.class);
         cancelIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         cancelIntent.setAction(SharePlugin.ACTION_CANCEL_SHARE);
diff --git a/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java b/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java
index 8b300951..a4798b54 100644
--- a/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java
+++ b/src/org/kde/kdeconnect/UserInterface/CustomDevicesAdapter.java
@@ -43,7 +43,6 @@ import butterknife.ButterKnife;
 
 public class CustomDevicesAdapter extends RecyclerView.Adapter<CustomDevicesAdapter.ViewHolder> {
     private ArrayList<String> customDevices;
-    private RecyclerView recyclerView;
     private final Callback callback;
 
     CustomDevicesAdapter(@NonNull Callback callback) {
@@ -62,7 +61,6 @@ public class CustomDevicesAdapter extends RecyclerView.Adapter<CustomDevicesAdap
     public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
         super.onAttachedToRecyclerView(recyclerView);
 
-        this.recyclerView = recyclerView;
         ItemTouchHelper itemTouchHelper = new ItemTouchHelper(
                 new ItemTouchHelperCallback(adapterPos -> callback.onCustomDeviceDismissed(customDevices.get(adapterPos))));
         itemTouchHelper.attachToRecyclerView(recyclerView);
diff --git a/tests/org/kde/kdeconnect/LanLinkTest.java b/tests/org/kde/kdeconnect/LanLinkTest.java
index d51e627a..d1e72e2e 100644
--- a/tests/org/kde/kdeconnect/LanLinkTest.java
+++ b/tests/org/kde/kdeconnect/LanLinkTest.java
@@ -54,7 +54,6 @@ public class LanLinkTest {
     private LanLink badLanLink;
     private LanLink goodLanLink;
 
-    private OutputStream badOutputStream;
     private OutputStream goodOutputStream;
 
     private Device.SendPacketStatusCallback callback;
@@ -69,7 +68,7 @@ public class LanLinkTest {
         callback = Mockito.mock(Device.SendPacketStatusCallback.class);
 
         goodOutputStream = Mockito.mock(OutputStream.class);
-        badOutputStream = Mockito.mock(OutputStream.class);
+        OutputStream badOutputStream = Mockito.mock(OutputStream.class);
         Mockito.doThrow(new IOException("AAA")).when(badOutputStream).write(Mockito.any(byte[].class));
 
 
-- 
GitLab