Lint checkup

app/src/main/java/info/knacki/pass/git/BaseGitProtocol.java

@@ -1,7 +1,5 @@
 package info.knacki.pass.git;
 
-import java.util.logging.Logger;
-
 import info.knacki.pass.git.entities.GitCommit;
 import info.knacki.pass.git.entities.GitRef;
 import info.knacki.pass.io.CharsetHelper;
@@ -11,7 +9,6 @@ import info.knacki.pass.settings.SettingsManager;
 
 public abstract class BaseGitProtocol implements GitInterface {
     protected final SettingsManager.Git fConfig;
-    private final static Logger log = Logger.getLogger(BaseGitProtocol.class.getName());
 
     BaseGitProtocol(SettingsManager.Git config) {
         fConfig = config;

app/src/main/java/info/knacki/pass/services/AccessibilityService.java

@@ -6,7 +6,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.Gravity;
-import android.view.View;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
@@ -19,10 +18,9 @@ import java.util.logging.Logger;
 import info.knacki.pass.R;
 
 public class AccessibilityService extends android.accessibilityservice.AccessibilityService {
-    private final long CANCEL_DELAY_SEC = 10;
+    private final static long CANCEL_DELAY_SEC = 10;
     private static AccessibilityService fInstance;
     private boolean fManagingEvent;
-    private View fOpenWindow;
 
     private class LastCancellation {
         public long lastCancelledTime;
@@ -77,12 +75,12 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi
                 PixelFormat.TRANSLUCENT);
         params.gravity = Gravity.START | Gravity.BOTTOM;
 
-        fOpenWindow = new AccessibilityView(this)
-                .Init(this, new AccessibilityView.AccessibilityViewListener() {
+        final AccessibilityView openWindow = new AccessibilityView(this);
+        openWindow.Init(this, new AccessibilityView.AccessibilityViewListener() {
                     @Override
                     public void OnPasswordClicked(File f) {
                         new Handler(getMainLooper()).post(() -> {
-                            CloseOpenWindow();
+                            CloseOpenWindow(openWindow);
                             LoadFile(f, source);
                         });
                     }
@@ -91,7 +89,7 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi
                     public void cancel() {
                         new Handler(getMainLooper()).post(() -> {
                             fLastCancellation.Cancel(source);
-                            CloseOpenWindow();
+                            CloseOpenWindow(openWindow);
                             fManagingEvent = false;
                             SetFocus(source);
                         });
@@ -101,21 +99,19 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi
 
         try {
             WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
-            wm.addView(fOpenWindow, params);
+            wm.addView(openWindow, params);
             return true;
         }
         catch (WindowManager.BadTokenException e) {
-            fOpenWindow = null;
             Toast.makeText(this, getResources().getString(R.string.app_name) +": " +getResources().getString(R.string.unauthorized_draw_over), Toast.LENGTH_LONG).show();
         }
         return false;
     }
 
-    private void CloseOpenWindow() {
-        if (fOpenWindow != null) {
+    private void CloseOpenWindow(AccessibilityView openWindow) {
+        if (openWindow != null) {
             WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
-            wm.removeViewImmediate(fOpenWindow);
-            fOpenWindow = null;
+            wm.removeViewImmediate(openWindow);
         }
     }
 
@@ -152,7 +148,6 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi
 
     @Override
     public void onInterrupt() {
-        new Handler(getMainLooper()).post(this::CloseOpenWindow);
     }
 
     @Override

app/src/main/java/info/knacki/pass/settings/ui/SettingsActivity.java

@@ -154,10 +154,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                 startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS));
                 return true;
             });
-            findPreference(getResources().getString(R.string.id_draw_over_settings)).setOnPreferenceClickListener(preference -> {
-                startActivity(new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION));
-                return true;
-            });
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                findPreference(getResources().getString(R.string.id_draw_over_settings)).setOnPreferenceClickListener(preference -> {
+                        startActivity(new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION));
+                    return true;
+                });
+            } else {
+                getPreferenceScreen().removePreference(findPreference(getResources().getString(R.string.id_draw_over_settings)));
+            }
         }
 
         @Override
@@ -166,10 +170,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             findPreference(getResources().getString(R.string.id_softSettings)).setSummary(IsKeyboardEnabled() ? R.string.pref_summary_keyboard_enabled : R.string.pref_summary_enable_keyboard);
             if (IsAccessibilityEnabled()) {
                 findPreference(getResources().getString(R.string.id_accessibility_settings)).setSummary(R.string.pref_summary_accessibility_enabled);
-                findPreference(getResources().getString(R.string.id_draw_over_settings)).setSummary(IsDrawOverEnabled() ? R.string.pref_summary_draw_over_enabled : R.string.pref_summary_draw_over_enable);
+                Preference p = findPreference(getResources().getString(R.string.id_draw_over_settings));
+                if (p != null)
+                    p.setSummary(IsDrawOverEnabled() ? R.string.pref_summary_draw_over_enabled : R.string.pref_summary_draw_over_enable);
             } else {
                 findPreference(getResources().getString(R.string.id_accessibility_settings)).setSummary(R.string.pref_summary_accessibility_disabled);
-                findPreference(getResources().getString(R.string.id_draw_over_settings)).setSummary(R.string.pref_summary_draw_over_unneeded);
+                Preference p = findPreference(getResources().getString(R.string.id_draw_over_settings));
+                if (p != null)
+                    p.setSummary(R.string.pref_summary_draw_over_unneeded);
             }
         }
 
@@ -386,7 +394,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             reload();
         }
 
-        private final void CreateBranch(String branchName) {
+        private void CreateBranch(String branchName) {
             if (branchName.equals(""))
                 return;
             GitPullActivity.StartCreateBranchActivity(getActivity(), branchName);
@@ -560,11 +568,11 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             SettingsManager.Git git = (SettingsManager.Git) SettingsManager.GetVCS(getActivity());
             if (in != null) {
                 try {
-                    File fout = new File(PathUtils.GetPrivateRSAKey(getActivity()));
-                    if (!fout.exists() && !fout.createNewFile()) {
+                    File fOut = new File(PathUtils.GetPrivateRSAKey(getActivity()));
+                    if (!fOut.exists() && !fOut.createNewFile()) {
                         throw new FileNotFoundException();
                     }
-                    FileUtils.pipe(in, new FileOutputStream(fout));
+                    FileUtils.pipe(in, new FileOutputStream(fOut));
                 } catch (IOException e) {
                     log.log(Level.SEVERE, "Cannot import private key: " + e.getMessage(), e);
                     return false;