diff --git a/build.gradle b/build.gradle index 219aded6..7a0f931f 100644 --- a/build.gradle +++ b/build.gradle @@ -24,14 +24,18 @@ android { exclude "META-INF/LICENSE.txt" exclude "META-INF/NOTICE.txt" } + lintOptions { + abortOnError false + } + } dependencies { repositories { mavenCentral() } - compile "com.android.support:support-v4:19.0.+" - compile "com.android.support:appcompat-v7:19.0.+" + compile "com.android.support:support-v4:19.1.+" + compile "com.android.support:appcompat-v7:19.1.+" compile "org.apache.mina:mina-core:2.0.+" compile 'org.bouncycastle:bcprov-jdk16:1.45' compile 'org.apache.sshd:sshd-core:0.8.0' diff --git a/kdeconnect-android.iml b/kdeconnect-android.iml index e7f8680f..bcbb5535 100644 --- a/kdeconnect-android.iml +++ b/kdeconnect-android.iml @@ -3,11 +3,10 @@ - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -74,12 +68,12 @@ - + + - diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 9af5a358..af762f2d 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,11 +1,11 @@ + android:targetSdkVersion="19" /> receivers = new ArrayList(); + private final BaseLinkProvider linkProvider; + private final String deviceId; + private final ArrayList receivers = new ArrayList(); protected PrivateKey privateKey; protected BaseLink(String deviceId, BaseLinkProvider linkProvider) { diff --git a/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java b/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java index b1d621b6..78bc6268 100644 --- a/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java +++ b/src/main/java/org/kde/kdeconnect/Backends/BaseLinkProvider.java @@ -9,7 +9,7 @@ import java.util.ArrayList; public abstract class BaseLinkProvider { - private ArrayList connectionReceivers = new ArrayList(); + private final ArrayList connectionReceivers = new ArrayList(); public interface ConnectionReceiver { public void onConnectionReceived(NetworkPackage identityPackage, BaseLink link); diff --git a/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java index e31e1448..c290e593 100644 --- a/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java +++ b/src/main/java/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java @@ -3,6 +3,7 @@ package org.kde.kdeconnect.Backends.LanBackend; import android.content.Context; import android.os.AsyncTask; import android.util.Log; +import android.support.v4.util.LongSparseArray; import org.apache.mina.core.future.ConnectFuture; import org.apache.mina.core.future.IoFuture; @@ -30,9 +31,9 @@ public class LanLinkProvider extends BaseLinkProvider { private final static int port = 1714; - private Context context; - private HashMap visibleComputers = new HashMap(); - private HashMap nioSessions = new HashMap(); + private final Context context; + private final HashMap visibleComputers = new HashMap(); + private final LongSparseArray nioSessions = new LongSparseArray(); private NioSocketAcceptor tcpAcceptor = null; private NioDatagramAcceptor udpAcceptor = null; @@ -41,8 +42,9 @@ public class LanLinkProvider extends BaseLinkProvider { @Override public void sessionClosed(IoSession session) throws Exception { - LanLink brokenLink = nioSessions.remove(session.getId()); + LanLink brokenLink = nioSessions.get(session.getId()); if (brokenLink != null) { + nioSessions.remove(session.getId()); connectionLost(brokenLink); brokenLink.disconnect(); String deviceId = brokenLink.getDeviceId(); @@ -92,7 +94,7 @@ public class LanLinkProvider extends BaseLinkProvider { } }; - private IoHandler udpHandler = new IoHandlerAdapter() { + private final IoHandler udpHandler = new IoHandlerAdapter() { @Override public void messageReceived(IoSession udpSession, Object message) throws Exception { super.messageReceived(udpSession, message); diff --git a/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java b/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java index 766881b2..deae6cef 100644 --- a/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java +++ b/src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java @@ -7,7 +7,7 @@ import org.kde.kdeconnect.NetworkPackage; public class LoopbackLinkProvider extends BaseLinkProvider { - private Context context; + private final Context context; public LoopbackLinkProvider(Context context) { this.context = context; diff --git a/src/main/java/org/kde/kdeconnect/BackgroundService.java b/src/main/java/org/kde/kdeconnect/BackgroundService.java index 8fe8db5b..b7d16eb7 100644 --- a/src/main/java/org/kde/kdeconnect/BackgroundService.java +++ b/src/main/java/org/kde/kdeconnect/BackgroundService.java @@ -26,11 +26,11 @@ import java.util.concurrent.locks.ReentrantLock; public class BackgroundService extends Service { - private ArrayList linkProviders = new ArrayList(); + private final ArrayList linkProviders = new ArrayList(); - private HashMap devices = new HashMap(); + private final HashMap devices = new HashMap(); - private Device.PairingCallback devicePairingCallback = new Device.PairingCallback() { + private final Device.PairingCallback devicePairingCallback = new Device.PairingCallback() { @Override public void incomingRequest() { if (deviceListChangedCallback != null) deviceListChangedCallback.onDeviceListChanged(); @@ -63,7 +63,7 @@ public class BackgroundService extends Service { } } - public void registerLinkProviders() { + private void registerLinkProviders() { SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); @@ -81,7 +81,7 @@ public class BackgroundService extends Service { return devices.get(id); } - private BaseLinkProvider.ConnectionReceiver deviceListener = new BaseLinkProvider.ConnectionReceiver() { + private final BaseLinkProvider.ConnectionReceiver deviceListener = new BaseLinkProvider.ConnectionReceiver() { @Override public void onConnectionReceived(final NetworkPackage identityPackage, final BaseLink link) { @@ -266,9 +266,9 @@ public class BackgroundService extends Service { void onServiceStart(BackgroundService service); } - private static ArrayList callbacks = new ArrayList(); + private final static ArrayList callbacks = new ArrayList(); - private static final Lock mutex = new ReentrantLock(true); + private final static Lock mutex = new ReentrantLock(true); @Override public int onStartCommand(Intent intent, int flags, int startId) { diff --git a/src/main/java/org/kde/kdeconnect/Device.java b/src/main/java/org/kde/kdeconnect/Device.java index 918e948b..c3cff37c 100644 --- a/src/main/java/org/kde/kdeconnect/Device.java +++ b/src/main/java/org/kde/kdeconnect/Device.java @@ -35,10 +35,10 @@ import java.util.TimerTask; public class Device implements BaseLink.PackageReceiver { - private Context context; + private final Context context; - private String deviceId; - private String name; + private final String deviceId; + private final String name; public PublicKey publicKey; private int notificationId; private int protocolVersion; @@ -61,11 +61,11 @@ public class Device implements BaseLink.PackageReceiver { private ArrayList pairingCallback = new ArrayList(); private Timer pairingTimer; - private ArrayList links = new ArrayList(); - private HashMap plugins = new HashMap(); - private HashMap failedPlugins = new HashMap(); + private final ArrayList links = new ArrayList(); + private final HashMap plugins = new HashMap(); + private final HashMap failedPlugins = new HashMap(); - SharedPreferences settings; + private final SharedPreferences settings; //Remembered trusted device, we need to wait for a incoming devicelink to communicate Device(Context context, String deviceId) { @@ -653,7 +653,7 @@ public class Device implements BaseLink.PackageReceiver { void onPluginsChanged(Device device); } - private ArrayList pluginsChangedListeners = new ArrayList(); + private final ArrayList pluginsChangedListeners = new ArrayList(); public void addPluginsChangedListener(PluginsChangedListener listener) { pluginsChangedListeners.add(listener); diff --git a/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java b/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java index 568ef11a..b11d33e4 100644 --- a/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java +++ b/src/main/java/org/kde/kdeconnect/Helpers/AppsHelper.java @@ -13,7 +13,7 @@ public class AppsHelper { try { PackageManager pm = context.getPackageManager(); - ApplicationInfo ai = pm.getApplicationInfo( packageName, 0); + ApplicationInfo ai = pm.getApplicationInfo(packageName, 0); return pm.getApplicationLabel(ai).toString(); diff --git a/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java b/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java index 60f6c093..84133ad4 100644 --- a/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java +++ b/src/main/java/org/kde/kdeconnect/Helpers/ContactsHelper.java @@ -3,9 +3,7 @@ package org.kde.kdeconnect.Helpers; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.provider.ContactsContract; import android.provider.ContactsContract.PhoneLookup; -import android.util.Log; public class ContactsHelper { @@ -31,7 +29,7 @@ public class ContactsHelper { // Take the first match only if (cursor != null && cursor.moveToFirst()) { - int nameIndex = cursor.getColumnIndex(ContactsContract.PhoneLookup.DISPLAY_NAME); + int nameIndex = cursor.getColumnIndex(PhoneLookup.DISPLAY_NAME); if (nameIndex != -1) { String name = cursor.getString(nameIndex); //Log.e("PhoneNumberLookup", "success: " + name); diff --git a/src/main/java/org/kde/kdeconnect/Helpers/DeviceHelper.java b/src/main/java/org/kde/kdeconnect/Helpers/DeviceHelper.java index 167487e9..9c5b4dda 100644 --- a/src/main/java/org/kde/kdeconnect/Helpers/DeviceHelper.java +++ b/src/main/java/org/kde/kdeconnect/Helpers/DeviceHelper.java @@ -11,7 +11,7 @@ public class DeviceHelper { //from https://github.com/meetup/android-device-names //Converted to java using: //cat android_models.properties | awk -F'=' '{sub(/ *$/, "", $1)} sub(/^ */, "", $2) { if ($2 != "") print "humanReadableNames.put(\""$1"\",\"" $2 "\");"}' - private static HashMap humanReadableNames = new HashMap(); + private final static HashMap humanReadableNames = new HashMap(); static { humanReadableNames.put("5860E","Coolpad Quattro 4G"); humanReadableNames.put("ADR6300","HTC Droid Incredible"); diff --git a/src/main/java/org/kde/kdeconnect/NetworkPackage.java b/src/main/java/org/kde/kdeconnect/NetworkPackage.java index 3332c7c5..565b69a5 100644 --- a/src/main/java/org/kde/kdeconnect/NetworkPackage.java +++ b/src/main/java/org/kde/kdeconnect/NetworkPackage.java @@ -8,7 +8,6 @@ import android.util.Base64; import android.util.Log; import org.json.JSONArray; -import org.json.JSONException; import org.json.JSONObject; import org.kde.kdeconnect.Helpers.DeviceHelper; import org.kde.kdeconnect.UserInterface.MainSettingsActivity; diff --git a/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java index 2254e47f..7761c213 100644 --- a/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java +++ b/src/main/java/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java @@ -8,7 +8,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.graphics.drawable.Drawable; import android.os.BatteryManager; -import android.util.Log; import android.widget.Button; import org.kde.kdeconnect.NetworkPackage; @@ -21,7 +20,7 @@ public class BatteryPlugin extends Plugin { private static final int THRESHOLD_EVENT_NONE= 0; private static final int THRESHOLD_EVENT_BATTERY_LOW = 1; - NetworkPackage lastInfo = null; + private NetworkPackage lastInfo = null; /*static { PluginFactory.registerPlugin(BatteryPlugin.class); @@ -52,7 +51,7 @@ public class BatteryPlugin extends Plugin { return true; } - private BroadcastReceiver receiver = new BroadcastReceiver() { + private final BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent batteryIntent) { diff --git a/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java b/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java index 4556d2f5..df8c99dc 100644 --- a/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java +++ b/src/main/java/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java @@ -10,11 +10,11 @@ import org.kde.kdeconnect.NetworkPackage; public class ClipboardListener { - private Context context; + private final Context context; private String currentContent; private ClipboardManager cm = null; - ClipboardManager.OnPrimaryClipChangedListener listener; + private ClipboardManager.OnPrimaryClipChangedListener listener; ClipboardListener(final Context ctx, final Device device) { context = ctx; diff --git a/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java b/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java index 07fae273..7d83d449 100644 --- a/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java +++ b/src/main/java/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java @@ -126,7 +126,7 @@ public class MprisActivity extends Activity { } - BaseLinkProvider.ConnectionReceiver connectionReceiver = new BaseLinkProvider.ConnectionReceiver() { + private final BaseLinkProvider.ConnectionReceiver connectionReceiver = new BaseLinkProvider.ConnectionReceiver() { @Override public void onConnectionReceived(NetworkPackage identityPackage, BaseLink link) { connectToPlugin(); diff --git a/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java b/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java index 8f7f7b52..cbdb05a0 100644 --- a/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java +++ b/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java @@ -5,7 +5,6 @@ import android.content.Context; import android.content.Intent; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; -import android.util.Log; import java.util.ArrayList; @@ -16,7 +15,7 @@ public class NotificationReceiver extends NotificationListenerService { void onNotificationRemoved(StatusBarNotification statusBarNotification); } - private ArrayList listeners = new ArrayList(); + private final ArrayList listeners = new ArrayList(); public void addListener(NotificationListener listener) { listeners.add(listener); @@ -61,7 +60,7 @@ public class NotificationReceiver extends NotificationListenerService { void onServiceStart(NotificationReceiver service); } - private static ArrayList callbacks = new ArrayList(); + private final static ArrayList callbacks = new ArrayList(); public static void Start(Context c) { RunCommand(c, null); diff --git a/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java index 48b44fba..c06f37ba 100644 --- a/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java +++ b/src/main/java/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java @@ -243,7 +243,7 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver. } } - if (ticker == "") { + if (ticker.isEmpty()) { ticker = (notification.tickerText != null)? notification.tickerText.toString() : ""; } } diff --git a/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java index 00019b1c..ffc1f298 100644 --- a/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java +++ b/src/main/java/org/kde/kdeconnect/Plugins/PluginFactory.java @@ -50,11 +50,11 @@ public class PluginFactory { return enabledByDefault; } - private String pluginName; - private String displayName; - private String description; + private final String pluginName; + private final String displayName; + private final String description; private final Drawable icon; - private boolean enabledByDefault; + private final boolean enabledByDefault; } diff --git a/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java b/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java index b8ef8eb4..d26409ad 100644 --- a/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java +++ b/src/main/java/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java @@ -10,7 +10,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.telephony.SmsMessage; import android.telephony.TelephonyManager; -import android.util.Log; import android.widget.Button; import org.kde.kdeconnect.Helpers.ContactsHelper; @@ -49,7 +48,7 @@ public class TelephonyPlugin extends Plugin { return true; } - private BroadcastReceiver receiver = new BroadcastReceiver() { + private final BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java index 97840f7d..3ba08198 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java @@ -32,7 +32,7 @@ public class DeviceActivity extends ActionBarActivity { static private String deviceId; //Static because if we get here by using the back button in the action bar, the extra deviceId will not be set. private Device device; - private Device.PluginsChangedListener pluginsChangedListener = new Device.PluginsChangedListener() { + private final Device.PluginsChangedListener pluginsChangedListener = new Device.PluginsChangedListener() { @Override public void onPluginsChanged(final Device device) { @@ -59,6 +59,7 @@ public class DeviceActivity extends ActionBarActivity { errorList.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int position, long id) { + if (position == 0) return; Plugin p = failedPlugins.get(ids[position - 1]); //Header is position 0, so we have to subtract one p.getErrorDialog(DeviceActivity.this).show(); } diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java index 263006fb..576cca6c 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java @@ -1,15 +1,9 @@ package org.kde.kdeconnect.UserInterface.List; - -import android.app.Activity; -import android.content.Intent; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import org.kde.kdeconnect.Device; -import org.kde.kdeconnect.UserInterface.DeviceActivity; -import org.kde.kdeconnect.UserInterface.PairActivity; import org.kde.kdeconnect_tp.R; public class EntryItem implements ListAdapter.Item { diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java b/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java index b123536c..2c108780 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java @@ -14,8 +14,8 @@ public class ListAdapter extends ArrayAdapter { public View inflateView(LayoutInflater layoutInflater); } - private ArrayList items; - private LayoutInflater layoutInflater; + private final ArrayList items; + private final LayoutInflater layoutInflater; public ListAdapter(Context context, ArrayList items) { super(context, 0, items); diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java index a103ad7a..bb76c36e 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/MainActivity.java @@ -6,7 +6,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -145,12 +144,13 @@ public class MainActivity extends ActionBarActivity { list.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { - view.callOnClick(); + view.performClick(); } }); } }); + } }); } diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java index 54155f7b..a7cbe7ab 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java @@ -67,7 +67,7 @@ public class MainSettingsActivity extends PreferenceActivity{ /** * Until now it sets only the default deviceName (if not already set). * It's safe to call this multiple time because doesn't override any previous value. - * @param context + * @param context the application context */ public static void initializeDeviceName(Context context){ // I could have used getDefaultSharedPreferences(context).contains but we need to check @@ -84,7 +84,7 @@ public class MainSettingsActivity extends PreferenceActivity{ } @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public static class GeneralPrefsFragment extends PreferenceFragment { + private static class GeneralPrefsFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java index de136590..475dc996 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java @@ -18,7 +18,7 @@ public class PairActivity extends ActionBarActivity { private String deviceId; private Device device = null; - private Device.PairingCallback pairingCallback = new Device.PairingCallback() { + private final Device.PairingCallback pairingCallback = new Device.PairingCallback() { @Override public void incomingRequest() { diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java b/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java index 3573dffe..4a8c932e 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java @@ -2,7 +2,6 @@ package org.kde.kdeconnect.UserInterface; import android.content.Context; import android.preference.Preference; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; @@ -12,7 +11,7 @@ import java.util.ArrayList; public class PreferenceListAdapter extends ArrayAdapter { - private ArrayList localList; + private final ArrayList localList; public PreferenceListAdapter(Context context, ArrayList items) { super(context,0, items); diff --git a/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java b/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java index 153e3625..e1599c5f 100644 --- a/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java +++ b/src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java @@ -4,7 +4,6 @@ import android.app.ListActivity; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; -import android.util.Log; import android.view.View; import android.widget.AdapterView; diff --git a/src/main/res/drawable-mdpi/ic_action_refresh.png b/src/main/res/drawable-mdpi/ic_action_refresh.png deleted file mode 100644 index eef97e9e..00000000 Binary files a/src/main/res/drawable-mdpi/ic_action_refresh.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_action_settings.png b/src/main/res/drawable-mdpi/ic_action_settings.png deleted file mode 100644 index fc2bf8c3..00000000 Binary files a/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_volume.png b/src/main/res/drawable-mdpi/ic_volume.png deleted file mode 100644 index 3c9ab74c..00000000 Binary files a/src/main/res/drawable-mdpi/ic_volume.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/icon.png b/src/main/res/drawable-mdpi/icon.png deleted file mode 100644 index 81b04efa..00000000 Binary files a/src/main/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/src/main/res/menu/main.xml b/src/main/res/menu/main.xml index 310ab234..189b0360 100644 --- a/src/main/res/menu/main.xml +++ b/src/main/res/menu/main.xml @@ -5,7 +5,7 @@ android:id="@+id/menu_refresh" android:icon="@drawable/ic_action_refresh" android:orderInCategory="200" - kdeconnect:showAsAction="always" + kdeconnect:showAsAction="ifRoom" android:title="@string/reconnect" /> @@ -13,7 +13,7 @@ android:id="@+id/menu_progress" android:orderInCategory="200" android:visible="false" - kdeconnect:showAsAction="always" + kdeconnect:showAsAction="ifRoom" kdeconnect:actionViewClass="android.widget.ProgressBar" /> diff --git a/src/main/res/values-bs/strings.xml b/src/main/res/values-bs/strings.xml deleted file mode 100644 index 170cfd7c..00000000 --- a/src/main/res/values-bs/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - Baterijski izvještaj - Periodično javi baterijski status - Ping - Šalji i primaj ping-ove - Sinhronizovano obavještenje -