diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java index a0b2dcd273ac798bade7532694f2f8a98920e705..94bc572db0f01f04c16b57c536c1fb44d17fdd24 100644 --- a/src/org/kde/kdeconnect/Device.java +++ b/src/org/kde/kdeconnect/Device.java @@ -77,7 +77,7 @@ public class Device implements BaseLink.PacketReceiver { private final CopyOnWriteArrayList links = new CopyOnWriteArrayList<>(); - private List m_supportedPlugins = new ArrayList<>(); + private List supportedPlugins = new ArrayList<>(); private final ConcurrentHashMap plugins = new ConcurrentHashMap<>(); private final ConcurrentHashMap pluginsWithoutPermissions = new ConcurrentHashMap<>(); private final ConcurrentHashMap pluginsWithoutOptionalPermissions = new ConcurrentHashMap<>(); @@ -147,7 +147,7 @@ public class Device implements BaseLink.PacketReceiver { this.deviceType = DeviceType.FromString(settings.getString("deviceType", "desktop")); //Assume every plugin is supported until addLink is called and we can get the actual list - m_supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins()); + supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins()); //Do not load plugins yet, the device is not present //reloadPluginsFromSettings(); @@ -494,9 +494,9 @@ public class Device implements BaseLink.PacketReceiver { Set outgoingCapabilities = identityPacket.getStringSet("outgoingCapabilities", null); Set incomingCapabilities = identityPacket.getStringSet("incomingCapabilities", null); if (incomingCapabilities != null && outgoingCapabilities != null) { - m_supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(incomingCapabilities, outgoingCapabilities)); + supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(incomingCapabilities, outgoingCapabilities)); } else { - m_supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins()); + supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins()); } link.addPacketReceiver(this); @@ -757,7 +757,7 @@ public class Device implements BaseLink.PacketReceiver { HashMap> newPluginsByIncomingInterface = new HashMap<>(); - for (String pluginKey : m_supportedPlugins) { + for (String pluginKey : supportedPlugins) { PluginFactory.PluginInfo pluginInfo = PluginFactory.getPluginInfo(pluginKey); @@ -837,7 +837,7 @@ public class Device implements BaseLink.PacketReceiver { } public List getSupportedPlugins() { - return m_supportedPlugins; + return supportedPlugins; } } diff --git a/src/org/kde/kdeconnect/Helpers/SMSHelper.java b/src/org/kde/kdeconnect/Helpers/SMSHelper.java index 1d20af5cff2175e46f26906e93def44a4df7807a..9b2db6db80df4fe8584e85a1bc8c38e7ca016def 100644 --- a/src/org/kde/kdeconnect/Helpers/SMSHelper.java +++ b/src/org/kde/kdeconnect/Helpers/SMSHelper.java @@ -146,7 +146,7 @@ public class SMSHelper { } Message message = new Message(messageInfo); - ThreadID threadID = new ThreadID(message.m_threadID); + ThreadID threadID = new ThreadID(message.threadID); if (!toReturn.containsKey(threadID)) { toReturn.put(threadID, new ArrayList<>()); @@ -224,12 +224,12 @@ public class SMSHelper { @NonNull public String toString() { - return this.threadID.toString(); + return threadID.toString(); } @Override public int hashCode() { - return this.threadID.hashCode(); + return threadID.hashCode(); } @Override @@ -243,13 +243,13 @@ public class SMSHelper { */ public static class Message { - final String m_address; - final String m_body; - public final long m_date; - final int m_type; - final int m_read; - final long m_threadID; // ThreadID is *int* for SMS messages but *long* for MMS - final int m_uID; + final String address; + final String body; + public final long date; + final int type; + final int read; + final long threadID; // ThreadID is *int* for SMS messages but *long* for MMS + final int uID; /** * Named constants which are used to construct a Message @@ -285,40 +285,40 @@ public class SMSHelper { }; Message(final HashMap messageInfo) { - m_address = messageInfo.get(Message.ADDRESS); - m_body = messageInfo.get(Message.BODY); - m_date = Long.parseLong(messageInfo.get(Message.DATE)); + address = messageInfo.get(Message.ADDRESS); + body = messageInfo.get(Message.BODY); + date = Long.parseLong(messageInfo.get(Message.DATE)); if (messageInfo.get(Message.TYPE) == null) { // To be honest, I have no idea why this happens. The docs say the TYPE field is mandatory. // Just stick some junk in here and hope we can figure it out later. // Quick investigation suggests that these are multi-target MMSes - m_type = -1; + type = -1; } else { - m_type = Integer.parseInt(messageInfo.get(Message.TYPE)); + type = Integer.parseInt(messageInfo.get(Message.TYPE)); } - m_read = Integer.parseInt(messageInfo.get(Message.READ)); - m_threadID = Long.parseLong(messageInfo.get(Message.THREAD_ID)); - m_uID = Integer.parseInt(messageInfo.get(Message.U_ID)); + read = Integer.parseInt(messageInfo.get(Message.READ)); + threadID = Long.parseLong(messageInfo.get(Message.THREAD_ID)); + uID = Integer.parseInt(messageInfo.get(Message.U_ID)); } public JSONObject toJSONObject() throws JSONException { JSONObject json = new JSONObject(); - json.put(Message.ADDRESS, m_address); - json.put(Message.BODY, m_body); - json.put(Message.DATE, m_date); - json.put(Message.TYPE, m_type); - json.put(Message.READ, m_read); - json.put(Message.THREAD_ID, m_threadID); - json.put(Message.U_ID, m_uID); + json.put(Message.ADDRESS, address); + json.put(Message.BODY, body); + json.put(Message.DATE, date); + json.put(Message.TYPE, type); + json.put(Message.READ, read); + json.put(Message.THREAD_ID, threadID); + json.put(Message.U_ID, uID); return json; } @Override public String toString() { - return this.m_body; + return body; } } diff --git a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java index eb7e93b42e352d8bef547d8d3a56c6d16e0360da..1f03c81304049f851c9038c0a8c89185f294851e 100644 --- a/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/SMSPlugin/SMSPlugin.java @@ -204,8 +204,8 @@ public class SMSPlugin extends Plugin { // Update the most recent counter mostRecentTimestampLock.lock(); for (SMSHelper.Message message : messages) { - if (message.m_date > mostRecentTimestamp) { - mPlugin.mostRecentTimestamp = message.m_date; + if (message.date > mostRecentTimestamp) { + mPlugin.mostRecentTimestamp = message.date; } } mostRecentTimestampLock.unlock(); @@ -374,8 +374,8 @@ public class SMSPlugin extends Plugin { // recent in every conversation mostRecentTimestampLock.lock(); for (SMSHelper.Message message : conversations.values()) { - if (message.m_date > mostRecentTimestamp) { - mostRecentTimestamp = message.m_date; + if (message.date > mostRecentTimestamp) { + mostRecentTimestamp = message.date; } } mostRecentTimestampLock.unlock();