diff --git a/app/src/main/java/org/fdroid/fdroid/FDroid.java b/app/src/main/java/org/fdroid/fdroid/FDroid.java
index eea6abf93..b4fbf3c73 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroid.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroid.java
@@ -64,7 +64,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
 
     public static final String EXTRA_TAB_UPDATE = "extraTab";
 
-    public static final String ACTION_ADD_REPO = "org.fdroid.fdroid.FDroid.ACTION_ADD_REPO";
+    private static final String ACTION_ADD_REPO = "org.fdroid.fdroid.FDroid.ACTION_ADD_REPO";
 
     private static final String ADD_REPO_INTENT_HANDLED = "addRepoIntentHandled";
 
diff --git a/app/src/main/java/org/fdroid/fdroid/Permission.java b/app/src/main/java/org/fdroid/fdroid/Permission.java
index 0257005ce..986290b61 100644
--- a/app/src/main/java/org/fdroid/fdroid/Permission.java
+++ b/app/src/main/java/org/fdroid/fdroid/Permission.java
@@ -4,12 +4,12 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.PermissionInfo;
 
-public class Permission {
+class Permission {
 
     private final PackageManager packageManager;
     private final PermissionInfo permissionInfo;
 
-    public Permission(Context context, String permission)
+    Permission(Context context, String permission)
             throws PackageManager.NameNotFoundException {
         this.packageManager = context.getPackageManager();
         this.permissionInfo = this.packageManager.getPermissionInfo(
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/Compatibility.java b/app/src/main/java/org/fdroid/fdroid/compat/Compatibility.java
index b20f05efb..d9df26dd8 100644
--- a/app/src/main/java/org/fdroid/fdroid/compat/Compatibility.java
+++ b/app/src/main/java/org/fdroid/fdroid/compat/Compatibility.java
@@ -14,7 +14,7 @@ public abstract class Compatibility {
         return apiLevel < 1 || getApi() <= apiLevel;
     }
 
-    protected static int getApi() {
+    static int getApi() {
         return Build.VERSION.SDK_INT;
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 27d650a88..ea2c20f75 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -313,6 +313,7 @@ public class App extends ValueObject implements Comparable<App> {
             FDroidApp.disableSpongyCastleOnLollipop();
             final InputStream tmpIn = apkJar.getInputStream(aSignedEntry);
             byte[] buff = new byte[2048];
+            //noinspection StatementWithEmptyBody
             while (tmpIn.read(buff, 0, buff.length) != -1) {
                 /*
                  * NOP - apparently have to READ from the JarEntry before you can
diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java
index 34fe99e8c..b4f25e050 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java
@@ -170,7 +170,7 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner
 
     }
 
-    private BroadcastReceiver onWifiStateChanged = new BroadcastReceiver() {
+    private final BroadcastReceiver onWifiStateChanged = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             setUIFromWifi();