diff --git a/KdeConnect/src/main/AndroidManifest.xml b/KdeConnect/src/main/AndroidManifest.xml index 5e4b7587..ff466ac3 100644 --- a/KdeConnect/src/main/AndroidManifest.xml +++ b/KdeConnect/src/main/AndroidManifest.xml @@ -7,6 +7,15 @@ + + + + + + + + + - - - - - - - - - diff --git a/KdeConnect/src/main/java/org/kde/connect/BackgroundService.java b/KdeConnect/src/main/java/org/kde/connect/BackgroundService.java index 1dc9f08a..78291e9e 100644 --- a/KdeConnect/src/main/java/org/kde/connect/BackgroundService.java +++ b/KdeConnect/src/main/java/org/kde/connect/BackgroundService.java @@ -26,11 +26,11 @@ import java.util.HashMap; public class BackgroundService extends Service { - ArrayList linkProviders = new ArrayList(); + private ArrayList linkProviders = new ArrayList(); - ArrayList packageInterfaces = new ArrayList(); + private ArrayList packageInterfaces = new ArrayList(); - HashMap devices = new HashMap(); + private HashMap devices = new HashMap(); public void registerLinkProviders() { diff --git a/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/BaseComputerLink.java b/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/BaseComputerLink.java index 6183384c..c8b0af1d 100644 --- a/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/BaseComputerLink.java +++ b/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 receivers = new ArrayList(); - 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 receivers = new ArrayList(); public void addPackageReceiver(PackageReceiver pr) { receivers.add(pr); diff --git a/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java b/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java index a590a062..a498c6cb 100644 --- a/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java +++ b/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; + } + } } diff --git a/KdeConnect/src/main/java/org/kde/connect/ContactsHelper.java b/KdeConnect/src/main/java/org/kde/connect/ContactsHelper.java index 2ff3b87a..01e5de30 100644 --- a/KdeConnect/src/main/java/org/kde/connect/ContactsHelper.java +++ b/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, diff --git a/KdeConnect/src/main/java/org/kde/connect/Device.java b/KdeConnect/src/main/java/org/kde/connect/Device.java index fbf0d13f..61828aa7 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Device.java +++ b/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; diff --git a/KdeConnect/src/main/java/org/kde/connect/LinkProviders/AvahiTcpLinkProvider.java b/KdeConnect/src/main/java/org/kde/connect/LinkProviders/AvahiTcpLinkProvider.java index d06cfd9c..762324e8 100644 --- a/KdeConnect/src/main/java/org/kde/connect/LinkProviders/AvahiTcpLinkProvider.java +++ b/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; - NsdManager mNsdManager; + private Context context; + private NsdManager mNsdManager; private NsdManager.DiscoveryListener oldListener = null; - HashMap visibleComputers = new HashMap(); + private HashMap visibleComputers = new HashMap(); public AvahiTcpLinkProvider(Context context) { this.context = context; diff --git a/KdeConnect/src/main/java/org/kde/connect/LinkProviders/BaseLinkProvider.java b/KdeConnect/src/main/java/org/kde/connect/LinkProviders/BaseLinkProvider.java index 89f9176e..d3801123 100644 --- a/KdeConnect/src/main/java/org/kde/connect/LinkProviders/BaseLinkProvider.java +++ b/KdeConnect/src/main/java/org/kde/connect/LinkProviders/BaseLinkProvider.java @@ -9,7 +9,7 @@ import java.util.ArrayList; public abstract class BaseLinkProvider { - ArrayList connectionReceivers = new ArrayList(); + private ArrayList connectionReceivers = new ArrayList(); public interface ConnectionReceiver { public void onConnectionAccepted(NetworkPackage identityPackage, BaseComputerLink link); diff --git a/KdeConnect/src/main/java/org/kde/connect/LinkProviders/BroadcastTcpLinkProvider.java b/KdeConnect/src/main/java/org/kde/connect/LinkProviders/BroadcastTcpLinkProvider.java index 963976db..7daac421 100644 --- a/KdeConnect/src/main/java/org/kde/connect/LinkProviders/BroadcastTcpLinkProvider.java +++ b/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; - HashMap visibleComputers = new HashMap(); - HashMap nioSessions = new HashMap(); + private Context context; + private HashMap visibleComputers = new HashMap(); + private HashMap nioSessions = new HashMap(); - NioSocketAcceptor tcpAcceptor = null; - NioDatagramAcceptor udpAcceptor = null; + private NioSocketAcceptor tcpAcceptor = null; + private NioDatagramAcceptor udpAcceptor = null; private final IoHandler tcpHandler = new IoHandlerAdapter() { @Override diff --git a/KdeConnect/src/main/java/org/kde/connect/MainActivity.java b/KdeConnect/src/main/java/org/kde/connect/MainActivity.java index 6f456b19..865738b6 100644 --- a/KdeConnect/src/main/java/org/kde/connect/MainActivity.java +++ b/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 devices = service.getVisibleDevices(); + String[] listContent = devices.toArray(new String[devices.size()]); ListView list = (ListView)findViewById(R.id.listView1); list.setAdapter(new ArrayAdapter(MainActivity.this, android.R.layout.simple_list_item_1, listContent)); } diff --git a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/BatteryMonitorPackageInterface.java b/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/BatteryMonitorPackageInterface.java index 73683217..31881ada 100644 --- a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/BatteryMonitorPackageInterface.java +++ b/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; - IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); - BroadcastReceiver receiver = new BroadcastReceiver() { + private Context context; + private IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); + private BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/ClipboardPackageInterface.java b/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/ClipboardPackageInterface.java index edd8bb80..a78466dc 100644 --- a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/ClipboardPackageInterface.java +++ b/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; - ClipboardManager cm; - ClipboardManager.OnPrimaryClipChangedListener listener = new ClipboardManager.OnPrimaryClipChangedListener() { + private Context context; + private ClipboardManager cm; + private ClipboardManager.OnPrimaryClipChangedListener listener = new ClipboardManager.OnPrimaryClipChangedListener() { @Override public void onPrimaryClipChanged() { try { diff --git a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/MprisControlPackageInterface.java b/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/MprisControlPackageInterface.java index fe46fe55..ff089a60 100644 --- a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/MprisControlPackageInterface.java +++ b/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 = ""; - Handler nowPlayingUpdated = null; + private String nowPlaying = ""; + private Handler nowPlayingUpdated = null; - ArrayList playerList = new ArrayList(); - Handler playerListUpdated = null; + private ArrayList playerList = new ArrayList(); + private Handler playerListUpdated = null; - String player = ""; + private String player = ""; @Override public boolean onCreate(Context ctx) { diff --git a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/PingPackageInterface.java b/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/PingPackageInterface.java index 0df6c11c..8388621e 100644 --- a/KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/PingPackageInterface.java +++ b/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) { diff --git a/KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java b/KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java index 5a8093cb..8df9a511 100644 --- a/KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java +++ b/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++) { - SmsMessage message = SmsMessage.createFromPdu((byte[])pdus[i]); + for (Object pdu : pdus) { + SmsMessage message = SmsMessage.createFromPdu((byte[])pdu); smsnotify.smsBroadcastReceived(message); } } catch(Exception e) { diff --git a/KdeConnect/src/main/java/org/kde/connect/SettingsFragment.java b/KdeConnect/src/main/java/org/kde/connect/SettingsFragment.java index 0ccaabeb..4d05a6dd 100644 --- a/KdeConnect/src/main/java/org/kde/connect/SettingsFragment.java +++ b/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) {