From 0e76e955ba4848b18ee458cb9f53cc8e64671146 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 23 Jun 2013 17:09:52 +0200 Subject: Fix issues found by Code Analysis --- src/de/blinkt/openvpn/api/APIVpnProfile.java | 5 +---- src/de/blinkt/openvpn/api/ExternalAppDatabase.java | 5 ++--- src/de/blinkt/openvpn/api/ExternalOpenVPNService.java | 7 ++++--- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/de/blinkt/openvpn/api') diff --git a/src/de/blinkt/openvpn/api/APIVpnProfile.java b/src/de/blinkt/openvpn/api/APIVpnProfile.java index dfcccf36..f5591764 100644 --- a/src/de/blinkt/openvpn/api/APIVpnProfile.java +++ b/src/de/blinkt/openvpn/api/APIVpnProfile.java @@ -12,10 +12,7 @@ public class APIVpnProfile implements Parcelable { public APIVpnProfile(Parcel in) { mUUID = in.readString(); mName = in.readString(); - if(in.readInt()==0) - mUserEditable=false; - else - mUserEditable=true; + mUserEditable = in.readInt() != 0; } public APIVpnProfile(String uuidString, String name, boolean userEditable) { diff --git a/src/de/blinkt/openvpn/api/ExternalAppDatabase.java b/src/de/blinkt/openvpn/api/ExternalAppDatabase.java index e640a13a..02c369b1 100644 --- a/src/de/blinkt/openvpn/api/ExternalAppDatabase.java +++ b/src/de/blinkt/openvpn/api/ExternalAppDatabase.java @@ -26,9 +26,8 @@ public class ExternalAppDatabase { } public Set getExtAppList() { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext); - Set allowedapps = prefs.getStringSet(PREFERENCES_KEY, new HashSet()); - return allowedapps; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext); + return prefs.getStringSet(PREFERENCES_KEY, new HashSet()); } void addApp(String packagename) diff --git a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java index 866fb698..35374c77 100644 --- a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java +++ b/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java @@ -76,7 +76,8 @@ public class ExternalOpenVPNService extends Service implements StateListener { } private final IOpenVPNAPIService.Stub mBinder = new IOpenVPNAPIService.Stub() { - private boolean checkOpenVPNPermission() throws SecurityRemoteException{ + + private void checkOpenVPNPermission() throws SecurityRemoteException{ PackageManager pm = getPackageManager(); for (String apppackage:mExtAppDb.getExtAppList()) { @@ -84,7 +85,7 @@ public class ExternalOpenVPNService extends Service implements StateListener { try { app = pm.getApplicationInfo(apppackage, 0); if (Binder.getCallingUid() == app.uid) { - return true; + return; } } catch (NameNotFoundException e) { // App not found. Remove it from the list @@ -299,7 +300,7 @@ public class ExternalOpenVPNService extends Service implements StateListener { { broadcastItem.newStatus(um.vpnUUID, um.state, um.logmessage, um.level.name()); } - }; + } } \ No newline at end of file -- cgit v1.2.3