From 8e603594969523547192fc8a0d1a942636b6943d Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@kdab.com>
Date: Sat, 20 Apr 2019 00:01:20 +0200
Subject: [PATCH] Fix warning when overriding methods with nonnull annotations

---
 .../Plugins/MprisReceiverPlugin/MprisReceiverCallback.java    | 2 +-
 src/org/kde/kdeconnect/UserInterface/DeviceFragment.java      | 3 ++-
 src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java    | 4 +++-
 src/org/kde/kdeconnect/UserInterface/MainActivity.java        | 3 ++-
 src/org/kde/kdeconnect/UserInterface/PairingFragment.java     | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverCallback.java b/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverCallback.java
index 97a4f615..6122f847 100644
--- a/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverCallback.java
+++ b/src/org/kde/kdeconnect/Plugins/MprisReceiverPlugin/MprisReceiverCallback.java
@@ -45,7 +45,7 @@ class MprisReceiverCallback extends MediaController.Callback {
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     @Override
-    public void onPlaybackStateChanged(@NonNull PlaybackState state) {
+    public void onPlaybackStateChanged(PlaybackState state) {
         plugin.sendMetadata(player);
     }
 
diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
index 1154997b..23385859 100644
--- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
@@ -34,6 +34,7 @@ import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
@@ -124,7 +125,7 @@ public class DeviceFragment extends Fragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         rootView = inflater.inflate(R.layout.activity_device, container, false);
diff --git a/src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java b/src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
index 0b1020a6..d883f99d 100644
--- a/src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
+++ b/src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
@@ -26,6 +26,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 
 public class ListAdapter extends ArrayAdapter<ListAdapter.Item> {
@@ -45,7 +47,7 @@ public class ListAdapter extends ArrayAdapter<ListAdapter.Item> {
 
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
         final Item i = items.get(position);
         return i.inflateView(layoutInflater);
     }
diff --git a/src/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
index 807c0145..3eec9178 100644
--- a/src/org/kde/kdeconnect/UserInterface/MainActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/MainActivity.java
@@ -25,6 +25,7 @@ import org.kde.kdeconnect_tp.R;
 import java.util.Collection;
 import java.util.HashMap;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
@@ -359,7 +360,7 @@ public class MainActivity extends AppCompatActivity implements SharedPreferences
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         boolean grantedPermission = false;
         for (int result : grantResults) {
             if (result == PackageManager.PERMISSION_GRANTED) {
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index c8b97b6b..357f20a8 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -45,6 +45,7 @@ import org.kde.kdeconnect_tp.R;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
@@ -66,7 +67,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
     private TextView headerText;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         //Log.e("PairingFragmen", "OnCreateView");
-- 
GitLab