Android Lint issues

KdeConnect/src/main/AndroidManifest.xml

@@ -7,6 +7,15 @@
     <uses-sdk android:minSdkVersion="16"
               android:targetSdkVersion="16" />
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.BATTERY_STATS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/icon"
@@ -59,13 +68,4 @@
 
     </application>
 
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.BATTERY_STATS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-
 </manifest>

KdeConnect/src/main/java/org/kde/connect/BackgroundService.java

@@ -26,11 +26,11 @@ import java.util.HashMap;
 
 public class BackgroundService extends Service {
 
-    ArrayList<BaseLinkProvider> linkProviders = new ArrayList<BaseLinkProvider>();
+    private ArrayList<BaseLinkProvider> linkProviders = new ArrayList<BaseLinkProvider>();
 
-    ArrayList<BasePackageInterface> packageInterfaces = new ArrayList<BasePackageInterface>();
+    private ArrayList<BasePackageInterface> packageInterfaces = new ArrayList<BasePackageInterface>();
 
-    HashMap<String, Device> devices = new HashMap<String, Device>();
+    private HashMap<String, Device> devices = new HashMap<String, Device>();
 
     public void registerLinkProviders() {
 

KdeConnect/src/main/java/org/kde/connect/ComputerLinks/BaseComputerLink.java

@@ -11,10 +11,10 @@ import java.util.ArrayList;
 public abstract class BaseComputerLink {
 
     private BaseLinkProvider linkProvider;
-
     private String deviceId;
+    private ArrayList<PackageReceiver> receivers = new ArrayList<PackageReceiver>();
 
-    public BaseComputerLink(String deviceId, BaseLinkProvider linkProvider) {
+    protected BaseComputerLink(String deviceId, BaseLinkProvider linkProvider) {
         this.linkProvider = linkProvider;
         this.deviceId = deviceId;
     }
@@ -35,7 +35,6 @@ public abstract class BaseComputerLink {
     public interface PackageReceiver {
         public void onPackageReceived(NetworkPackage np);
     }
-    ArrayList<PackageReceiver> receivers = new ArrayList<PackageReceiver>();
 
     public void addPackageReceiver(PackageReceiver pr) {
         receivers.add(pr);

KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java

@@ -30,18 +30,6 @@ public class TcpComputerLink extends BaseComputerLink {
         connect(ip,port,null,null);
     }
 
-    @Override
-    public boolean sendPackage(NetworkPackage np) {
-        Log.e("TcpComputerLink", "sendPackage");
-        if (session == null) {
-            Log.e("TcpComputerLink","not yet connected");
-            return false;
-        } else {
-            session.write(np.serialize());
-            return true;
-        }
-    }
-
     public void connect(final InetAddress ip, final int port, final Handler callback, final Handler brokenHandler) {
 
         Log.e("TcpComputerLink","connect: "+ip.toString()+":"+port);
@@ -94,4 +82,15 @@ public class TcpComputerLink extends BaseComputerLink {
 
     }
 
+    @Override
+    public boolean sendPackage(NetworkPackage np) {
+        Log.e("TcpComputerLink", "sendPackage");
+        if (session == null) {
+            Log.e("TcpComputerLink","not yet connected");
+            return false;
+        } else {
+            session.write(np.serialize());
+            return true;
+        }
+    }
 }

KdeConnect/src/main/java/org/kde/connect/ContactsHelper.java

@@ -14,7 +14,6 @@ public class ContactsHelper {
         Log.e("PhoneNumberLookup", number);
 
         Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
-        Cursor cursor = null;
         try {
             cursor = context.getContentResolver().query(
                     uri,

KdeConnect/src/main/java/org/kde/connect/Device.java

@@ -18,7 +18,6 @@ public class Device {
     private String deviceId;
     private String name;
 
-
     Device(String deviceId, String name, BaseComputerLink dl) {
         this.deviceId = deviceId;
         this.name = name;

KdeConnect/src/main/java/org/kde/connect/LinkProviders/AvahiTcpLinkProvider.java

@@ -14,13 +14,13 @@ import java.util.HashMap;
 
 public class AvahiTcpLinkProvider extends BaseLinkProvider {
 
-    String serviceType = "_kdeconnect._tcp";
+    private final String serviceType = "_kdeconnect._tcp";
 
-    Context context;
+    private Context context;
-    NsdManager mNsdManager;
+    private NsdManager mNsdManager;
     private NsdManager.DiscoveryListener oldListener = null;
 
-    HashMap<String, TcpComputerLink> visibleComputers = new HashMap<String, TcpComputerLink>();
+    private HashMap<String, TcpComputerLink> visibleComputers = new HashMap<String, TcpComputerLink>();
 
     public AvahiTcpLinkProvider(Context context) {
         this.context = context;

KdeConnect/src/main/java/org/kde/connect/LinkProviders/BaseLinkProvider.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 
 public abstract class BaseLinkProvider {
 
-    ArrayList<ConnectionReceiver> connectionReceivers = new ArrayList<ConnectionReceiver>();
+    private ArrayList<ConnectionReceiver> connectionReceivers = new ArrayList<ConnectionReceiver>();
 
     public interface ConnectionReceiver {
         public void onConnectionAccepted(NetworkPackage identityPackage, BaseComputerLink link);

KdeConnect/src/main/java/org/kde/connect/LinkProviders/BroadcastTcpLinkProvider.java

@@ -31,12 +31,12 @@ public class BroadcastTcpLinkProvider extends BaseLinkProvider {
 
     private final static int port = 1714;
 
-    Context context;
+    private Context context;
-    HashMap<String, NioSessionComputerLink> visibleComputers = new HashMap<String, NioSessionComputerLink>();
+    private HashMap<String, NioSessionComputerLink> visibleComputers = new HashMap<String, NioSessionComputerLink>();
-    HashMap<Long, NioSessionComputerLink> nioSessions = new HashMap<Long, NioSessionComputerLink>();
+    private HashMap<Long, NioSessionComputerLink> nioSessions = new HashMap<Long, NioSessionComputerLink>();
 
-    NioSocketAcceptor tcpAcceptor = null;
+    private NioSocketAcceptor tcpAcceptor = null;
-    NioDatagramAcceptor udpAcceptor = null;
+    private NioDatagramAcceptor udpAcceptor = null;
 
     private final IoHandler tcpHandler = new IoHandlerAdapter() {
         @Override

KdeConnect/src/main/java/org/kde/connect/MainActivity.java

@@ -16,6 +16,8 @@ import org.kde.connect.LinkProviders.BaseLinkProvider;
 import org.kde.connect.PackageInterfaces.PingPackageInterface;
 import org.kde.kdeconnect.R;
 
+import java.util.ArrayList;
+
 public class MainActivity extends Activity {
 
 
@@ -81,7 +83,8 @@ public class MainActivity extends Activity {
                     @Override
                     public void run() {
                         Log.e("MainActivity","updateComputerList");
-                        String[] listContent = service.getVisibleDevices().toArray(new String[0]);
+                        ArrayList<String> devices = service.getVisibleDevices();
+                        String[] listContent = devices.toArray(new String[devices.size()]);
                         ListView list = (ListView)findViewById(R.id.listView1);
                         list.setAdapter(new ArrayAdapter<String>(MainActivity.this, android.R.layout.simple_list_item_1, listContent));
                     }

KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/BatteryMonitorPackageInterface.java

@@ -12,11 +12,11 @@ import org.kde.connect.NetworkPackage;
 
 public class BatteryMonitorPackageInterface extends BasePackageInterface {
 
-    NetworkPackage lastPackage = null;
+    private NetworkPackage lastPackage = null;
 
-    Context context;
+    private Context context;
-    IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+    private IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
-    BroadcastReceiver receiver = new BroadcastReceiver() {
+    private BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
 

KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/ClipboardPackageInterface.java

@@ -9,11 +9,11 @@ import org.kde.connect.NetworkPackage;
 
 public class ClipboardPackageInterface extends BasePackageInterface {
 
-    boolean ignore_next_clipboard_change = false;
+    private boolean ignore_next_clipboard_change = false;
 
-    Context context;
+    private Context context;
-    ClipboardManager cm;
+    private ClipboardManager cm;
-    ClipboardManager.OnPrimaryClipChangedListener listener = new ClipboardManager.OnPrimaryClipChangedListener() {
+    private ClipboardManager.OnPrimaryClipChangedListener listener = new ClipboardManager.OnPrimaryClipChangedListener() {
         @Override
         public void onPrimaryClipChanged() {
             try {

KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/MprisControlPackageInterface.java

@@ -1,6 +1,5 @@
 package org.kde.connect.PackageInterfaces;
 
-import android.R;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -16,15 +15,15 @@ import java.util.ArrayList;
 
 public class MprisControlPackageInterface extends BasePackageInterface {
 
-    Context context;
+    private Context context;
 
-    String nowPlaying = "";
+    private String nowPlaying = "";
-    Handler nowPlayingUpdated = null;
+    private Handler nowPlayingUpdated = null;
 
-    ArrayList<String> playerList = new ArrayList<String>();
+    private ArrayList<String> playerList = new ArrayList<String>();
-    Handler playerListUpdated = null;
+    private Handler playerListUpdated = null;
 
-    String player = "";
+    private String player = "";
 
     @Override
     public boolean onCreate(Context ctx) {

KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/PingPackageInterface.java

@@ -12,7 +12,7 @@ import org.kde.connect.NetworkPackage;
 
 public class PingPackageInterface extends BasePackageInterface {
 
-    Context context;
+    private Context context;
 
     @Override
     public boolean onCreate(Context ctx) {

KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java

@@ -61,8 +61,8 @@ public class ServiceLauncher extends BroadcastReceiver
                     if (smsnotify == null) return;
                     try {
                         Object[] pdus = (Object[]) bundle.get("pdus");
-                        for (int i = 0; i < pdus.length; i++) {
+                        for (Object pdu : pdus) {
-                            SmsMessage message = SmsMessage.createFromPdu((byte[])pdus[i]);
+                            SmsMessage message = SmsMessage.createFromPdu((byte[])pdu);
                             smsnotify.smsBroadcastReceived(message);
                         }
                     } catch(Exception e) {

KdeConnect/src/main/java/org/kde/connect/SettingsFragment.java

@@ -10,7 +10,7 @@ import org.kde.kdeconnect.R;
 
 public class SettingsFragment extends PreferenceFragment {
 
-    SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+    private SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {