Inline more variables

Reviewers: #kde_connect, mtijink

Reviewed By: #kde_connect, mtijink

Subscribers: #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D10945

src/org/kde/kdeconnect/Device.java

@@ -795,8 +795,7 @@ public class Device implements BaseLink.PackageReceiver {
 
     public boolean isPluginEnabled(String pluginKey) {
         boolean enabledByDefault = PluginFactory.getPluginInfo(context, pluginKey).isEnabledByDefault();
-        boolean enabled = settings.getBoolean(pluginKey, enabledByDefault);
+        return settings.getBoolean(pluginKey, enabledByDefault);
-        return enabled;
     }
 
     public void reloadPluginsFromSettings() {

src/org/kde/kdeconnect/Helpers/DeviceHelper.java

@@ -477,8 +477,7 @@ public class DeviceHelper {
     public static boolean isTablet() {
         Configuration config = Resources.getSystem().getConfiguration();
         //This assumes that the values for the screen sizes are consecutive, so XXLARGE > XLARGE > LARGE
-        boolean isLarge = ((config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE);
+        return ((config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE);
-        return isLarge;
     }
 
     //It returns getAndroidDeviceName() if no user-defined name has been set with setDeviceName().

src/org/kde/kdeconnect/Helpers/SecurityHelpers/RsaHelper.java

@@ -76,8 +76,8 @@ public class RsaHelper {
         try {
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
             byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
-            PublicKey publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
+            
-            return publicKey;
+            return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
         } catch (Exception e) {
             throw e;
         }
@@ -87,8 +87,7 @@ public class RsaHelper {
         try {
             SharedPreferences settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
             byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
-            PublicKey publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
+            return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
-            return publicKey;
         } catch (Exception e) {
             throw e;
         }
@@ -99,8 +98,7 @@ public class RsaHelper {
         try {
             SharedPreferences globalSettings = PreferenceManager.getDefaultSharedPreferences(context);
             byte[] privateKeyBytes = Base64.decode(globalSettings.getString("privateKey", ""), 0);
-            PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
+            return KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
-            return privateKey;
         } catch (Exception e) {
             throw e;
         }

src/org/kde/kdeconnect/NetworkPackage.java

@@ -161,8 +161,7 @@ public class NetworkPackage {
             jo.put("payloadTransferInfo", mPayloadTransferInfo);
         }
         //QJSon does not escape slashes, but Java JSONObject does. Converting to QJson format.
-        String json = jo.toString().replace("\\/","/")+"\n";
+        return jo.toString().replace("\\/", "/") + "\n";
-        return json;
     }
 
     static public NetworkPackage unserialize(String s) throws JSONException {

src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java

@@ -111,14 +111,12 @@ public class BatteryPlugin extends Plugin {
 
     @Override
     public String[] getSupportedPackageTypes() {
-        String[] packetTypes = {PACKAGE_TYPE_BATTERY_REQUEST};
+        return new String[]{PACKAGE_TYPE_BATTERY_REQUEST};
-        return packetTypes;
     }
 
     @Override
     public String[] getOutgoingPackageTypes() {
-        String[] packetTypes = {PACKAGE_TYPE_BATTERY};
+        return new String[]{PACKAGE_TYPE_BATTERY};
-        return packetTypes;
     }
 
 }

src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java

@@ -75,14 +75,12 @@ public class ClipboardPlugin extends Plugin {
 
     @Override
     public String[] getSupportedPackageTypes() {
-        String[] packetTypes = {PACKAGE_TYPE_CLIPBOARD};
+        return new String[]{PACKAGE_TYPE_CLIPBOARD};
-        return packetTypes;
     }
 
     @Override
     public String[] getOutgoingPackageTypes() {
-        String[] packetTypes = {PACKAGE_TYPE_CLIPBOARD};
+        return new String[]{PACKAGE_TYPE_CLIPBOARD};
-        return packetTypes;
     }
 
 

src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java

@@ -133,8 +133,7 @@ public class SftpPlugin extends Plugin {
 
     @Override
     public String[] getRequiredPermissions() {
-        String[] perms = {Manifest.permission.READ_EXTERNAL_STORAGE};
+        return new String[]{Manifest.permission.READ_EXTERNAL_STORAGE};
-        return perms;
     }
 
     @Override