diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 12f4d9157..96b2b6baf 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -373,7 +373,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        fdroidApp = ((FDroidApp) getApplication());
+        fdroidApp = (FDroidApp) getApplication();
         fdroidApp.applyTheme(this);
 
         super.onCreate(savedInstanceState);
@@ -1523,7 +1523,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
          * Shows or hides progress bar and related views.
          */
         private void setProgressVisible(boolean visible) {
-            int state = (visible) ? View.VISIBLE : View.GONE;
+            int state = visible ? View.VISIBLE : View.GONE;
             progressBar.setVisibility(state);
             progressSize.setVisibility(state);
             progressPercent.setVisibility(state);
@@ -1614,7 +1614,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                 if (updateWanted) {
                     if (getApp().suggestedVercode > 0) {
                         final Apk apkToInstall = ApkProvider.Helper.find(activity, getApp().id, getApp().suggestedVercode);
-                        (activity).install(apkToInstall);
+                        activity.install(apkToInstall);
                         return;
                     }
                 }
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index 6eb43c770..0ff2330d9 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -69,7 +69,7 @@ public class FDroid extends ActionBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        fdroidApp = ((FDroidApp) getApplication());
+        fdroidApp = (FDroidApp) getApplication();
         fdroidApp.applyTheme(this);
 
         super.onCreate(savedInstanceState);
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index ad6bf43f6..684fb9ed9 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -140,7 +140,7 @@ public class FDroidApp extends Application {
     public static void initWifiSettings() {
         port = 8888;
         ipAddressString = null;
-        subnetInfo = (new SubnetUtils("0.0.0.0/32").getInfo());
+        subnetInfo = new SubnetUtils("0.0.0.0/32").getInfo();
         ssid = "";
         bssid = "";
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java
index 425f8b801..6defc1c15 100644
--- a/F-Droid/src/org/fdroid/fdroid/Utils.java
+++ b/F-Droid/src/org/fdroid/fdroid/Utils.java
@@ -462,7 +462,7 @@ public final class Utils {
         }
 
         public static String str(CommaSeparatedList instance) {
-            return (instance == null ? null : instance.toString());
+            return instance == null ? null : instance.toString();
         }
 
         @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java b/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java
index 388c7e085..b20f05efb 100644
--- a/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java
+++ b/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java
@@ -11,7 +11,7 @@ public abstract class Compatibility {
 
     // like maxSdkVersion
     protected static boolean upToApi(int apiLevel) {
-        return (apiLevel < 1 || getApi() <= apiLevel);
+        return apiLevel < 1 || getApi() <= apiLevel;
     }
 
     protected static int getApi() {
diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java
index 0f2b4afb3..c874dfa50 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/App.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/App.java
@@ -340,8 +340,8 @@ public class App extends ValueObject implements Comparable<App> {
         apk.sig = Utils.hashBytes(fdroidSig, "md5");
 
         this.installedApk = apk;
-        this.system = ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-        this.updatedSystemApp = ((appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0);
+        this.system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+        this.updatedSystemApp = (appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         this.uninstallable = !this.system || this.updatedSystemApp;
     }
 
@@ -405,7 +405,7 @@ public class App extends ValueObject implements Comparable<App> {
     public boolean hasUpdates() {
         boolean updates = false;
         if (suggestedVercode > 0) {
-            updates = (installedVersionCode > 0 && installedVersionCode < suggestedVercode);
+            updates = installedVersionCode > 0 && installedVersionCode < suggestedVercode;
         }
         return updates;
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
index 2cccc074a..208dedfd9 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
@@ -301,7 +301,7 @@ public class DBHelper extends SQLiteOpenHelper {
                     while (!cursor.isAfterLast()) {
                         Repo repo = new Repo();
                         repo.address = cursor.getString(0);
-                        repo.inuse = (cursor.getInt(1) == 1);
+                        repo.inuse = cursor.getInt(1) == 1;
                         repo.pubkey = cursor.getString(2);
                         oldrepos.add(repo);
                         cursor.moveToNext();
@@ -491,8 +491,8 @@ public class DBHelper extends SQLiteOpenHelper {
 
     private static boolean columnExists(SQLiteDatabase db,
             String table, String column) {
-        return (db.rawQuery("select * from " + table + " limit 0,1", null)
-                .getColumnIndex(column) != -1);
+        return db.rawQuery("select * from " + table + " limit 0,1", null)
+                .getColumnIndex(column) != -1;
     }
 
 }
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
index 6fc72e487..c981a5786 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
@@ -255,8 +255,8 @@ public class PrivilegedInstaller extends Installer {
             return;
         }
 
-        final boolean isSystem = ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-        final boolean isUpdate = ((appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0);
+        final boolean isSystem = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+        final boolean isUpdate = (appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
 
         if (isSystem && !isUpdate) {
             // Cannot remove system apps unless we're uninstalling updates
diff --git a/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java
index c337fe0fd..218258d4a 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java
@@ -88,11 +88,9 @@ public class BluetoothDownloader extends Downloader {
     @Override
     public boolean isCached() {
         FileDetails details = getFileDetails();
-        return (
-            details != null &&
+        return details != null &&
             details.getCacheTag() != null &&
-            details.getCacheTag().equals(getCacheTag())
-            );
+            details.getCacheTag().equals(getCacheTag());
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index 3a3d29f27..e147ec5f3 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -223,10 +223,10 @@ public class WifiStateChangeService extends Service {
             return null;
         } else {
             return String.format(Locale.ENGLISH, "%d.%d.%d.%d",
-                    (ipAddress & 0xff),
-                    (ipAddress >> 8 & 0xff),
-                    (ipAddress >> 16 & 0xff),
-                    (ipAddress >> 24 & 0xff));
+                    ipAddress & 0xff,
+                    ipAddress >> 8 & 0xff,
+                    ipAddress >> 16 & 0xff,
+                    ipAddress >> 24 & 0xff);
         }
     }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
index 330be9510..9d516d086 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
@@ -120,7 +120,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
 
             @Override
             protected Boolean doInBackground(Void... params) {
-                return (Shell.SU.version(true) != null);
+                return Shell.SU.version(true) != null;
             }
 
             @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
index 032a9c4be..9bdcf1600 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
@@ -433,14 +433,14 @@ public class AppSecurityPermissions {
     private boolean isDisplayablePermission(PermissionInfo pInfo, int newReqFlags,
             int existingReqFlags) {
         final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE;
-        final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL);
-        final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS);
+        final boolean isNormal = base == PermissionInfo.PROTECTION_NORMAL;
+        final boolean isDangerous = base == PermissionInfo.PROTECTION_DANGEROUS;
         final boolean isRequired =
-                ((newReqFlags & PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 0);
+                (newReqFlags & PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 0;
         final boolean wasGranted =
-                ((existingReqFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0);
+                (existingReqFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
         final boolean isGranted =
-                ((newReqFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0);
+                (newReqFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
 
         // Dangerous and normal permissions are always shown to the user if the permission
         // is required, or it was previously granted
@@ -450,7 +450,7 @@ public class AppSecurityPermissions {
         }
 
         final boolean isDevelopment =
-                ((pInfo.protectionLevel & PermissionInfo.PROTECTION_FLAG_DEVELOPMENT) != 0);
+                (pInfo.protectionLevel & PermissionInfo.PROTECTION_FLAG_DEVELOPMENT) != 0;
 
         // Development permissions are only shown to the user if they are already
         // granted to the app -- if we are installing an app and they are not
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
index 142ef67df..a2ba35593 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
@@ -93,7 +93,7 @@ public class InstallConfirmActivity extends Activity implements OnCancelListener
             mScrollView = new CaffeinatedScrollView(this);
             mScrollView.setFillViewport(true);
             final boolean newPermissionsFound =
-                    (perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) > 0);
+                    perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) > 0;
             if (newPermissionsFound) {
                 permVisible = true;
                 mScrollView.addView(perms.getPermissionsView(
diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java
index 9c947373a..766d3ded9 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java
@@ -140,9 +140,9 @@ public abstract class AppListAdapter extends CursorAdapter {
     }
 
     private void layoutIcon(ImageView icon, boolean compact) {
-        int size = (int) mContext.getResources().getDimension((compact
+        int size = (int) mContext.getResources().getDimension(compact
             ? R.dimen.applist_icon_compact_size
-            : R.dimen.applist_icon_normal_size));
+            : R.dimen.applist_icon_normal_size);
 
         LinearLayout.LayoutParams params =
             (LinearLayout.LayoutParams) icon.getLayoutParams();
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
index 8642228fb..037e6b2c5 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
@@ -173,7 +173,7 @@ public class SelectAppsView extends ListView implements
         adapter.swapCursor(cursor);
 
         for (int i = 0; i < getCount(); i++) {
-            Cursor c = ((Cursor) getItemAtPosition(i));
+            Cursor c = (Cursor) getItemAtPosition(i);
             String packageName = c.getString(c.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID));
             getState().ensureFDroidSelected();
             for (String selected : getState().getAppsToSwap()) {
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
index d7be3a7c1..e2d02651f 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -213,7 +213,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In
             int textResource = getManager().isBluetoothDiscoverable() ? R.string.swap_visible_bluetooth : R.string.swap_not_visible_bluetooth;
             textBluetoothVisible.setText(textResource);
 
-            final SwitchCompat bluetoothSwitch = ((SwitchCompat) findViewById(R.id.switch_bluetooth));
+            final SwitchCompat bluetoothSwitch = (SwitchCompat) findViewById(R.id.switch_bluetooth);
             Utils.debugLog(TAG, getManager().isBluetoothDiscoverable() ? "Initially marking switch as checked, because Bluetooth is discoverable." : "Initially marking switch as not-checked, because Bluetooth is not discoverable.");
             bluetoothSwitch.setChecked(getManager().isBluetoothDiscoverable());
             bluetoothSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
index 093386ad3..f90517b9f 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
@@ -150,9 +150,9 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity
         @Override
         public void onReceive(Context context, Intent intent) {
 
-            TextView progressText = ((TextView) findViewById(R.id.heading));
-            TextView errorText    = ((TextView) findViewById(R.id.error));
-            Button   backButton   = ((Button) findViewById(R.id.back));
+            TextView progressText = (TextView) findViewById(R.id.heading);
+            TextView errorText    = (TextView) findViewById(R.id.error);
+            Button   backButton   = (Button) findViewById(R.id.back);
 
             String message;
             if (intent.hasExtra(getMessageExtra())) {
diff --git a/Privileged-Extension/src/main/java/org/fdroid/fdroid/privileged/PrivilegedService.java b/Privileged-Extension/src/main/java/org/fdroid/fdroid/privileged/PrivilegedService.java
index 29e1a3228..fb97b835e 100644
--- a/Privileged-Extension/src/main/java/org/fdroid/fdroid/privileged/PrivilegedService.java
+++ b/Privileged-Extension/src/main/java/org/fdroid/fdroid/privileged/PrivilegedService.java
@@ -44,13 +44,13 @@ public class PrivilegedService extends Service {
 
     private boolean hasPrivilegedPermissionsImpl() {
         boolean hasInstallPermission =
-                (getPackageManager().checkPermission(Manifest.permission.INSTALL_PACKAGES, getPackageName())
-                        == PackageManager.PERMISSION_GRANTED);
+                getPackageManager().checkPermission(Manifest.permission.INSTALL_PACKAGES, getPackageName())
+                        == PackageManager.PERMISSION_GRANTED;
         boolean hasDeletePermission =
-                (getPackageManager().checkPermission(Manifest.permission.DELETE_PACKAGES, getPackageName())
-                        == PackageManager.PERMISSION_GRANTED);
+                getPackageManager().checkPermission(Manifest.permission.DELETE_PACKAGES, getPackageName())
+                        == PackageManager.PERMISSION_GRANTED;
 
-        return (hasInstallPermission && hasDeletePermission);
+        return hasInstallPermission && hasDeletePermission;
     }
 
     private void installPackageImpl(Uri packageURI, int flags, String installerPackageName,
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 0bd1953f7..b393a6c3d 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -46,6 +46,7 @@
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter" />
         <module name="WhitespaceAround" />
+        <module name="UnnecessaryParentheses" />
 
         <module name="ModifierOrder" />
         <module name="RedundantModifier" />
@@ -63,6 +64,7 @@
         <!--<module name="MissingSwitchDefault" />-->
 
         <module name="FinalClass" />
+
         <!--<module name="HideUtilityClassConstructor" />-->
         <!--<module name="InterfaceIsType" />-->
         <!--<module name="VisibilityModifier" />-->