Cleanup code

.gitignore

@@ -1,9 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+/.idea
 .DS_Store
 /build
 /captures

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- For fingerprint unlock -->
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <!-- For GPG keys -->
@@ -14,7 +15,6 @@
 
     <application
         android:allowBackup="true"
-        android:extractNativeLibs="false"
         android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -35,8 +35,7 @@
 
         <activity
             android:name=".settings.ui.SettingsActivity"
-            android:label="@string/settings"
-            android:parentActivityName=".ui.MainActivity">
+            android:label="@string/settings">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="info.knacki.pass.ui.MainActivity" />

app/src/main/java/info/knacki/pass/generator/PasswordGenerator.java

@@ -10,6 +10,7 @@ public class PasswordGenerator {
         int length();
     }
 
+    @SuppressWarnings("SpellCheckingInspection")
     private static String generateAlphabet(PasswordGeneratorParams wiz) {
         StringBuilder abc = new StringBuilder();
         if (wiz.hasSpecialChar())

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

@@ -1,11 +1,9 @@
 package info.knacki.pass.git;
 
-import android.content.Context;
-
 import info.knacki.pass.settings.SettingsManager;
 
 public class GitInterfaceFactory {
-    public static GitInterface factory(Context ctx, SettingsManager.Git config) {
+    public static GitInterface factory(SettingsManager.Git config) {
         if (config.GetUrl().startsWith("http://") || config.GetUrl().startsWith("https://"))
             return new HttpGitProtocol(config);
         return null;

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

@@ -76,7 +76,7 @@ class HttpGitProtocol implements GitInterface {
             try {
                 log.log(Level.INFO, "fetching " +fUrl.toString());
                 URLConnection httpClient = fUrl.openConnection();
-                if (fConfig.HasAuthentification()) {
+                if (fConfig.HasAuthentication()) {
                     Authenticator.setDefault(new Authenticator() {
                         @Override
                         protected PasswordAuthentication getPasswordAuthentication() {
@@ -161,7 +161,7 @@ class HttpGitProtocol implements GitInterface {
                 for (Map.Entry<String, String> header: fHeaders.entrySet()) {
                     httpClient.setRequestProperty(header.getKey(), header.getValue());
                 }
-                if (fConfig.HasAuthentification()) {
+                if (fConfig.HasAuthentication()) {
                     httpClient.setRequestProperty("Authorization", "basic " +Base64.encodeToString("fConfig.GetUser():fConfig.GetPassword()".getBytes(), Base64.NO_WRAP));
                 }
                 fOnReadyWrite.OnResponse(httpClient.getOutputStream());
@@ -325,7 +325,7 @@ class HttpGitProtocol implements GitInterface {
             @Override
             public void OnResponse(byte[] result) {
                 FillTree(fCurrentTree, result);
-                fCurrentTree = fRoot.FindNextUninitialiazedTree();
+                fCurrentTree = fRoot.FindNextNotInitializedTree();
                 if (fCurrentTree != null)
                     PullHash(fCurrentTree.Initialize().GetHash());
                 else
@@ -390,16 +390,16 @@ class HttpGitProtocol implements GitInterface {
         GetRefs(new OnResponseListener<GitRef[]>() {
             @Override
             public void OnResponse(final GitRef[] result) {
-                GitRef myref = null;
+                GitRef myRef = null;
                 response.OnMsg("Found refs: ");
                 for (GitRef ref: result) {
                     response.OnMsg("\t> "+ref.GetBranch());
                     if (ref.GetBranch().equals(fConfig.GetBranch()))
-                        myref = ref;
+                        myRef = ref;
                 }
-                if (myref != null) {
-                    response.OnMsg("Checking out branch " +myref.GetBranchName() +" revision " +myref.GetHash());
-                    FetchCommit(myref, new OnResponseListener<GitCommit>() {
+                if (myRef != null) {
+                    response.OnMsg("Checking out branch " +myRef.GetBranchName() +" revision " +myRef.GetHash());
+                    FetchCommit(myRef, new OnResponseListener<GitCommit>() {
                         @Override
                         public void OnResponse(final GitCommit result) {
                             response.OnMsg("Finished read commit");
@@ -475,14 +475,14 @@ class HttpGitProtocol implements GitInterface {
         GetRefs(new OnResponseListener<GitRef[]>() {
             @Override
             public void OnResponse(final GitRef[] result) {
-                GitRef myref = null;
+                GitRef myRef = null;
                 for (GitRef ref: result) {
                     if (ref.GetBranch().equals(fConfig.GetBranch()))
-                        myref = ref;
+                        myRef = ref;
                 }
-                if (myref != null) {
-                    final GitRef finalRef = myref;
-                    response.OnMsg("Pushing over " +myref.GetBranch() +" revision " +myref.GetHash());
+                if (myRef != null) {
+                    final GitRef finalRef = myRef;
+                    response.OnMsg("Pushing over " +myRef.GetBranch() +" revision " +myRef.GetHash());
                     try {
                         HashMap<String, String> headers = new HashMap<>();
                         headers.put("Content-Type", "application/x-git-receive-pack-request");

app/src/main/java/info/knacki/pass/git/entities/GitObject.java

@@ -137,13 +137,13 @@ public abstract class GitObject implements Comparable<GitObject>, GitPackable {
             return this;
         }
 
-        public GitTree FindNextUninitialiazedTree() {
+        public GitTree FindNextNotInitializedTree() {
             if (!IsInitialized())
                 return this;
             for (GitObject obj: fItems.values()) {
                 if (!(obj instanceof GitTree))
                     continue;
-                GitTree child = ((GitTree) obj).FindNextUninitialiazedTree();
+                GitTree child = ((GitTree) obj).FindNextNotInitializedTree();
                 if (child != null)
                     return child;
             }

app/src/main/java/info/knacki/pass/input/InputService.java

@@ -59,12 +59,8 @@ public class InputService extends InputMethodService implements PasswordClickLis
             }
             service.showInputMethodPicker();
         });
-        fInputView.findViewById(R.id.backspaceButton).setOnClickListener(view -> {
-            getCurrentInputConnection().deleteSurroundingText(1, 0);
-        });
-        fInputView.findViewById(R.id.generateButton).setOnClickListener(view -> {
-            CreatePassword();
-        });
+        fInputView.findViewById(R.id.backspaceButton).setOnClickListener(view -> getCurrentInputConnection().deleteSurroundingText(1, 0));
+        fInputView.findViewById(R.id.generateButton).setOnClickListener(view -> CreatePassword());
         fInputView.findViewById(R.id.openAppButton).setOnClickListener(view -> startActivity(new Intent(InputService.this, MainActivity.class)));
         return fInputView;
     }

app/src/main/java/info/knacki/pass/io/FileInterfaceFactory.java

@@ -18,9 +18,9 @@ public class FileInterfaceFactory {
     private static final ArrayDeque<EncryptionMethodItem> fEncryptionMethods = new ArrayDeque<>();
 
     static {
-        fEncryptionMethods.add(new EncryptionMethodItem((ctx, passwordGetter, file) -> new RawFileInterface(ctx.getResources(), file), SettingsManager.EncryptionType.TYPE_RAW,".raw", R.string.pref_enctype_title_none));
-        fEncryptionMethods.add(new EncryptionMethodItem(GPGFileInterface::new, SettingsManager.EncryptionType.TYPE_GPG,".gpg", R.string.pref_enctype_title_gpg));
-        fEncryptionMethods.add(new EncryptionMethodItem(PasswordFileInterface::new, SettingsManager.EncryptionType.TYPE_PASSWORD, PasswordFileInterface.PASSWORD_SUFFIX, R.string.pref_enctype_title_password));
+        fEncryptionMethods.add(new EncryptionMethodItem((ctx, passwordGetter, file) -> new RawFileInterface(ctx.getResources(), file), SettingsManager.EncryptionType.TYPE_RAW,".raw", R.string.pref_enc_type_title_none));
+        fEncryptionMethods.add(new EncryptionMethodItem(GPGFileInterface::new, SettingsManager.EncryptionType.TYPE_GPG,".gpg", R.string.pref_enc_type_title_gpg));
+        fEncryptionMethods.add(new EncryptionMethodItem(PasswordFileInterface::new, SettingsManager.EncryptionType.TYPE_PASSWORD, PasswordFileInterface.PASSWORD_SUFFIX, R.string.pref_enc_type_title_password));
     }
 
     public interface OnPasswordEnteredListener extends OnErrorListener {
@@ -46,7 +46,7 @@ public class FileInterfaceFactory {
         final IFileInterface.IFileInterfaceCreator fFactory;
         final String fFileSuffix;
         final int fName;
-        SettingsManager.EncryptionType fEncryptionType;
+        final SettingsManager.EncryptionType fEncryptionType;
 
         EncryptionMethodItem(IFileInterface.IFileInterfaceCreator factory, SettingsManager.EncryptionType type, String fileSuffix, int name) {
             fFactory = factory;

app/src/main/java/info/knacki/pass/io/FileMigrator.java → app/src/main/java/info/knacki/pass/io/FileMigratoryUtils.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import java.io.File;
 import java.util.ArrayDeque;
 
-public class FileMigrator {
+public class FileMigratoryUtils {
     public interface MigratePasswordCondition {
         boolean isRelevantForMigration(File f);
     }
@@ -29,7 +29,7 @@ public class FileMigrator {
         return files;
     }
 
-    public static void MigratePassword(Context ctx, IFileInterface from, IFileInterface to, OnResponseListener<Void> onDone) {
+    public static void MigratePassword(IFileInterface from, IFileInterface to, OnResponseListener<Void> onDone) {
         from.ReadFile(new OnResponseListener<String>() {
             @Override
             public void OnResponse(String result) {
@@ -49,7 +49,7 @@ public class FileMigrator {
     }
 
     public static void MigratePassword(Context ctx, File from, File to, FileInterfaceFactory.PasswordGetter passInput, OnResponseListener<Void> onDone, boolean removePrevious) {
-        MigratePassword(ctx, FileInterfaceFactory.GetFileInterface(ctx, passInput, from), FileInterfaceFactory.GetFileInterface(ctx, passInput, to), from.getAbsolutePath().equals(to.getAbsolutePath()) || !removePrevious ? onDone : new OnResponseListener<Void>() {
+        MigratePassword(FileInterfaceFactory.GetFileInterface(ctx, passInput, from), FileInterfaceFactory.GetFileInterface(ctx, passInput, to), from.getAbsolutePath().equals(to.getAbsolutePath()) || !removePrevious ? onDone : new OnResponseListener<Void>() {
             @Override
             public void OnResponse(Void result) {
                 from.delete();

app/src/main/java/info/knacki/pass/io/GPGFileInterface.java

@@ -72,6 +72,6 @@ class GPGFileInterface implements IFileInterface {
         } else {
             details = r.getString(R.string.unset_gpg_key);
         }
-        return r.getString(R.string.pref_enctype_title_gpg) +" (" +details +")";
+        return r.getString(R.string.pref_enc_type_title_gpg) +" (" +details +")";
     }
 }

app/src/main/java/info/knacki/pass/io/GPGUtil.java

@@ -89,8 +89,8 @@ public class GPGUtil {
         final PGPPrivateKey fPrivateKey;
         final String fPass;
 
-        PGPPrivateKeyAndPass(PGPPrivateKey priv, String key) {
-            fPrivateKey = priv;
+        PGPPrivateKeyAndPass(PGPPrivateKey privateKey, String key) {
+            fPrivateKey = privateKey;
             fPass = key;
         }
     }
@@ -115,10 +115,10 @@ public class GPGUtil {
     }
 
     private static void FindPassword(final FileInterfaceFactory.PasswordGetter passwordGetter, final PGPSecretKey pgpSecKey, final OnResponseListener<PGPPrivateKeyAndPass> resp) {
-        PGPPrivateKeyAndPass priv = TryPassword(pgpSecKey, "");
+        PGPPrivateKeyAndPass privateKey = TryPassword(pgpSecKey, "");
 
-        if (priv != null) {
-            resp.OnResponse(priv);
+        if (privateKey != null) {
+            resp.OnResponse(privateKey);
         } else {
             FileInterfaceFactory.OnPasswordEnteredListener onResp = new FileInterfaceFactory.OnPasswordEnteredListener() {
                 @Override
@@ -127,9 +127,9 @@ public class GPGUtil {
                         resp.OnError("Invalid password", null);
                         return false;
                     } else {
-                        PGPPrivateKeyAndPass priv = TryPassword(pgpSecKey, result);
-                        if (priv != null) {
-                            resp.OnResponse(priv);
+                        PGPPrivateKeyAndPass privateKey = TryPassword(pgpSecKey, result);
+                        if (privateKey != null) {
+                            resp.OnResponse(privateKey);
                             return true;
                         } else {
                             passwordGetter.GetPassword(this);
@@ -364,9 +364,9 @@ public class GPGUtil {
     public static byte[] Generate(String user) {
         try {
             final Date now = new Date();
-            RSAKeyPairGenerator rsakeygen = new RSAKeyPairGenerator();
-            rsakeygen.init(new RSAKeyGenerationParameters(BigInteger.valueOf(257), new SecureRandom(), 2048, 12));
-            PGPKeyPair rsaEncr = new BcPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsakeygen.generateKeyPair(), now);
+            RSAKeyPairGenerator rsaKeygen = new RSAKeyPairGenerator();
+            rsaKeygen.init(new RSAKeyGenerationParameters(BigInteger.valueOf(257), new SecureRandom(), 2048, 12));
+            PGPKeyPair rsaEncryptor = new BcPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaKeygen.generateKeyPair(), now);
 
             PGPSignatureSubpacketGenerator encHashGen = new PGPSignatureSubpacketGenerator();
             encHashGen.setKeyFlags(false, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE);
@@ -374,13 +374,13 @@ public class GPGUtil {
             final PBESecretKeyEncryptor newEncryptor = new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256).setProvider("BC").build("".toCharArray());
             PGPKeyRingGenerator keygen = new PGPKeyRingGenerator(
                     PGPSignature.POSITIVE_CERTIFICATION,
-                    rsaEncr,
+                    rsaEncryptor,
                     user,
                     new BcPGPDigestCalculatorProvider().get(HashAlgorithmTags.SHA1),
                     encHashGen.generate(),
                     null,
                     new BcPGPContentSignerBuilder(
-                            rsaEncr.getPublicKey().getAlgorithm(),
+                            rsaEncryptor.getPublicKey().getAlgorithm(),
                             HashAlgorithmTags.SHA1),
                     newEncryptor);
             ArrayList<PGPSecretKeyRing> keyringCollection = new ArrayList<>();

app/src/main/java/info/knacki/pass/io/PasswordFileInterface.java

@@ -49,7 +49,7 @@ class PasswordFileInterface implements IFileInterface {
         fPasswordGetter = passwordGetter;
         fPassword = SettingsManager.GetPassword(ctx).toCharArray();
         Resources r = ctx.getResources();
-        fMethodName = r.getString(R.string.pref_enctype_title_password);
+        fMethodName = r.getString(R.string.pref_enc_type_title_password);
     }
 
     private boolean TryPassword(String pass, OnResponseListener<InputStream> onResponse) {

app/src/main/java/info/knacki/pass/io/PathUtils.java

@@ -4,6 +4,7 @@ import android.content.Context;
 
 public class PathUtils {
     private static final String DATA_DIR_NAME = "pass";
+    @SuppressWarnings("SpellCheckingInspection")
     private static final String DATA_GIT_LOCAL = "gitfiles";
     private static final String DATA_FINGER_LOCAL = "fingerprint";
 

app/src/main/java/info/knacki/pass/io/RawFileInterface.java

@@ -14,7 +14,7 @@ class RawFileInterface implements IFileInterface {
 
     RawFileInterface(Resources r, File f) {
         fFile = f;
-        fMethodName = r.getString(R.string.pref_enctype_title_none);
+        fMethodName = r.getString(R.string.pref_enc_type_title_none);
     }
 
     @Override

app/src/main/java/info/knacki/pass/settings/SettingsManager.java

@@ -49,7 +49,7 @@ public class SettingsManager {
     }
 
     public static abstract class VCS {
-        public static VCS factory(String system, String data) {
+        static VCS factory(String system, String data) {
             if ("git".equals(system))
                 return new Git(data);
             return null;
@@ -60,12 +60,12 @@ public class SettingsManager {
     }
 
     public static class Git extends VCS {
-        protected String fUrl;
-        protected String fUser;
-        protected String fPassword;
-        protected String fBranch;
-        protected String fUsername;
-        protected String fUserEmail;
+        String fUrl;
+        String fUser;
+        String fPassword;
+        String fBranch;
+        String fUsername;
+        String fUserEmail;
 
         Git(String data) {
             if (null == data || data.isEmpty()) {
@@ -142,16 +142,16 @@ public class SettingsManager {
             return fUrl;
         }
 
-        public String SetPassword(String pass) {
-            return fPassword = pass;
+        public void SetPassword(String pass) {
+            fPassword = pass;
         }
 
         public String GetPassword() {
             return fPassword;
         }
 
-        public String SetUser(String user) {
-            return fUser = user;
+        public void SetUser(String user) {
+            fUser = user;
         }
 
         public String GetUser() {
@@ -160,21 +160,21 @@ public class SettingsManager {
 
         public String GetUsername() { return fUsername; }
 
-        public String SetUsername(String val) { return fUsername = val; }
+        public void SetUsername(String val) { fUsername = val; }
 
         public String GetUserEmail() { return fUserEmail; }
 
-        public String SetUserEmail(String val) { return fUserEmail = val; }
+        public void SetUserEmail(String val) { fUserEmail = val; }
 
-        public String SetBranch(String branch) {
-            return fBranch = branch;
+        public void SetBranch(String branch) {
+            fBranch = branch;
         }
 
         public String GetBranch() {
             return fBranch;
         }
 
-        public boolean HasAuthentification() {
+        public boolean HasAuthentication() {
             return !"".equals(fUser);
         }
 
@@ -195,6 +195,10 @@ public class SettingsManager {
     }
 
     private final static String SHARED_PREF_FILE = "pass_prefs";
+    @SuppressWarnings("SpellCheckingInspection") private static final String ENCRYPTION_PASSWORD = "encPasswd";
+    private static final String FINGERPRINT_ACTIVE = "FingerprintEnabled";
+    private static final String GPG_KEY_FILE = "GPGKeyFile";
+
 
     private static SharedPreferences GetPrefManager(Context c) {
         return c.getSharedPreferences(SHARED_PREF_FILE, Context.MODE_PRIVATE);
@@ -205,7 +209,7 @@ public class SettingsManager {
     }
 
     public static void SetDefaultEncryptionType(Context ctx, EncryptionType value) {
-        GetPrefManager(ctx).edit().putInt(EncryptionType.class.getSimpleName(), value.IntValue()).commit();
+        GetPrefManager(ctx).edit().putInt(EncryptionType.class.getSimpleName(), value.IntValue()).apply();
     }
 
     public static VCS GetVCS(Context ctx) {
@@ -216,22 +220,22 @@ public class SettingsManager {
     public static void SetVCS(Context ctx, VCS vcs) {
         final SharedPreferences.Editor prefs = GetPrefManager(ctx).edit();
         if (vcs != null)
-            prefs.putString(VCS.class.getSimpleName(), vcs.GetName()).putString(VCS.class.getSimpleName()+"_data", vcs.GetData()).commit();
+            prefs.putString(VCS.class.getSimpleName(), vcs.GetName()).putString(VCS.class.getSimpleName()+"_data", vcs.GetData()).apply();
         else
             prefs.remove(VCS.class.getSimpleName()).commit();
     }
 
     private static void doSetGpgKeyContent(Context ctx, String content) {
-        GetPrefManager(ctx).edit().putString("GPGKeyFile", content).commit();
+        GetPrefManager(ctx).edit().putString(GPG_KEY_FILE, content).apply();
     }
 
     public static void RemoveGpgKey(Context ctx) {
-        GetPrefManager(ctx).edit().remove("GPGKeyFile").commit();
+        GetPrefManager(ctx).edit().remove(GPG_KEY_FILE).apply();
     }
 
     public static boolean SetGPGKeyContent(Context ctx, InputStream stream) {
         if (stream == null) {
-            GetPrefManager(ctx).edit().remove("GPGKeyFile").commit();
+            GetPrefManager(ctx).edit().remove(GPG_KEY_FILE).apply();
             return false;
         }
         try {
@@ -253,14 +257,14 @@ public class SettingsManager {
     }
 
     public static InputStream GetGPGKeyContent(Context ctx) {
-        String content = GetPrefManager(ctx).getString("GPGKeyFile", null);
+        String content = GetPrefManager(ctx).getString(GPG_KEY_FILE, null);
         if (content != null)
             return new ByteArrayInputStream(Base64.decode(content, 0));
         return null;
     }
 
     public static boolean HasGPGKey(Context ctx) {
-        return GetPrefManager(ctx).contains("GPGKeyFile");
+        return GetPrefManager(ctx).contains(GPG_KEY_FILE);
     }
 
     public static boolean HasPassword(Context ctx) {
@@ -268,18 +272,18 @@ public class SettingsManager {
     }
 
     public static String GetPassword(Context ctx) {
-        return GetPrefManager(ctx).getString("encPasswd", "");
+        return GetPrefManager(ctx).getString(ENCRYPTION_PASSWORD, "");
     }
 
     public static void SetPassword(Context ctx, String password) {
-        GetPrefManager(ctx).edit().putString("encPasswd", password).commit();
+        GetPrefManager(ctx).edit().putString(ENCRYPTION_PASSWORD, password).apply();
     }
 
     public static boolean IsFingerprintEnabled(Context ctx) {
-        return GetPrefManager(ctx).getBoolean("FingerprintEnabled", false);
+        return GetPrefManager(ctx).getBoolean(FINGERPRINT_ACTIVE, false);
     }
 
     public static void SetFingerprintEnabled(Context ctx, boolean value) {
-        GetPrefManager(ctx).edit().putBoolean("FingerprintEnabled", value).commit();
+        GetPrefManager(ctx).edit().putBoolean(FINGERPRINT_ACTIVE, value).apply();
     }
 }

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

@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -17,7 +16,6 @@ import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.SwitchPreference;
-import android.provider.MediaStore;
 import android.support.v4.app.ShareCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v7.app.ActionBar;
@@ -45,7 +43,7 @@ import info.knacki.pass.git.GitInterface;
 import info.knacki.pass.git.GitInterfaceFactory;
 import info.knacki.pass.git.entities.GitRef;
 import info.knacki.pass.io.FileInterfaceFactory;
-import info.knacki.pass.io.FileMigrator;
+import info.knacki.pass.io.FileMigratoryUtils;
 import info.knacki.pass.io.FileUtils;
 import info.knacki.pass.io.GPGUtil;
 import info.knacki.pass.io.OnResponseListener;
@@ -199,7 +197,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_encryption);
             setHasOptionsMenu(true);
 
-            ListPreference encTypePref = (ListPreference) findPreference(getResources().getString(R.string.id_enctype));
+            ListPreference encTypePref = (ListPreference) findPreference(getResources().getString(R.string.id_enc_type));
             final int encTypeIndex = GetEncryptionMethodNames(SettingsManager.GetDefaultEncryptionType(getActivity()));
             encTypePref.setEntries(fEncryptionMethodNames);
             String[] encValues = new String[fEncryptionMethodNames.length];
@@ -215,7 +213,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                 return true;
             });
 
-            SwitchPreference fingerPref = (SwitchPreference) findPreference(getString(R.string.id_pref_enctype_fingerprint));
+            SwitchPreference fingerPref = (SwitchPreference) findPreference(getString(R.string.id_pref_enc_type_fingerprint));
             fingerPref.setChecked(SettingsManager.IsFingerprintEnabled(getActivity()));
             fingerPref.setOnPreferenceChangeListener((preference, o) -> {
                 SettingsManager.SetFingerprintEnabled(getActivity(), (Boolean) o);
@@ -312,7 +310,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     SettingsManager.SetVCS(getActivity(), git);
                 }
             });
-            findPreference(getResources().getString(R.string.id_vcs_git_ci_useremail)).setOnPreferenceChangeListener(new PrefListener() {
+            findPreference(getResources().getString(R.string.id_vcs_git_ci_user_email)).setOnPreferenceChangeListener(new PrefListener() {
                 @Override
                 void savePref(Preference preference, Object o) {
                     SettingsManager.Git git = (SettingsManager.Git) SettingsManager.GetVCS(getActivity());
@@ -373,7 +371,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     gitUrl.setSummary(((SettingsManager.Git) versioning).GetUrl());
                     gitUrl.setText(((SettingsManager.Git) versioning).GetUrl());
 
-                    FindPreference(R.string.id_vcs_git_authcategory);
+                    FindPreference(R.string.id_vcs_git_auth_category);
                     EditTextPreference gitUser = (EditTextPreference) FindPreference(R.string.id_vcs_git_user);
                     gitUser.setSummary(((SettingsManager.Git) versioning).GetUser());
                     gitUser.setText(((SettingsManager.Git) versioning).GetUser());
@@ -382,7 +380,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     gitPass.setSummary(((SettingsManager.Git) versioning).GetPassword().length() == 0 ? "" : "******");
                     gitPass.setText(((SettingsManager.Git) versioning).GetPassword());
 
-                    FindPreference(R.string.id_vcs_git_commitinfocategory);
+                    FindPreference(R.string.id_vcs_git_commit_info_category);
                     ListPreference gitBranches = (ListPreference) FindPreference(R.string.id_vcs_git_branches);
                     populateBranches(gitBranches, (SettingsManager.Git) versioning);
 
@@ -392,7 +390,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     gitUsername.setSummary(((SettingsManager.Git) versioning).GetUsername());
                     gitUsername.setDefaultValue(((SettingsManager.Git) versioning).GetUsername());
 
-                    EditTextPreference gitUserEmail = (EditTextPreference) FindPreference(R.string.id_vcs_git_ci_useremail);
+                    EditTextPreference gitUserEmail = (EditTextPreference) FindPreference(R.string.id_vcs_git_ci_user_email);
                     gitUserEmail.setSummary(((SettingsManager.Git) versioning).GetUserEmail());
                     gitUserEmail.setDefaultValue(((SettingsManager.Git) versioning).GetUserEmail());
                 } else {
@@ -402,9 +400,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                             R.string.id_vcs_git_branches,
                             R.string.id_vcs_git_pull,
                             R.string.id_vcs_git_ci_username,
-                            R.string.id_vcs_git_ci_useremail,
-                            R.string.id_vcs_git_commitinfocategory,
-                            R.string.id_vcs_git_authcategory);
+                            R.string.id_vcs_git_ci_user_email,
+                            R.string.id_vcs_git_commit_info_category,
+                            R.string.id_vcs_git_auth_category);
                 }
             } else {
                 ((SwitchPreference) findPreference(getResources().getString(R.string.id_vcs_enable))).setChecked(false);
@@ -418,15 +416,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     R.string.id_vcs_git_branches,
                     R.string.id_vcs_git_pull,
                     R.string.id_vcs_git_ci_username,
-                    R.string.id_vcs_git_ci_useremail,
-                    R.string.id_vcs_git_commitinfocategory,
-                    R.string.id_vcs_git_authcategory);
+                    R.string.id_vcs_git_ci_user_email,
+                    R.string.id_vcs_git_commit_info_category,
+                    R.string.id_vcs_git_auth_category);
             }
         }
 
         protected void populateBranches(final ListPreference gitBranches, final SettingsManager.Git versioning) {
             gitBranches.setEnabled(false);
-            GitInterface gitInterface = GitInterfaceFactory.factory(getActivity(), versioning);
+            GitInterface gitInterface = GitInterfaceFactory.factory(versioning);
             if (gitInterface != null) {
                 gitInterface.GetRefs(new OnResponseListener<GitRef[]>() {
                     @Override
@@ -476,7 +474,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
     }
 
     public static class GPGPreferenceFragment extends PreferenceFragment {
-        public final static int ACTIVITY_REQUEST_CODE_BROWSEGPG = 1;
+        public final static int ACTIVITY_REQUEST_CODE_BROWSE_GPG = 1;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -484,11 +482,11 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_gpg);
             setHasOptionsMenu(true);
 
-            findPreference(getResources().getString(R.string.id_gpg_keyfile)).setOnPreferenceClickListener(preference -> {
+            findPreference(getResources().getString(R.string.id_gpg_key_file)).setOnPreferenceClickListener(preference -> {
                 Intent i = new Intent(Intent.ACTION_GET_CONTENT);
                 i.setType("*/*");
                 i.addCategory(Intent.CATEGORY_OPENABLE);
-                GPGPreferenceFragment.this.startActivityForResult(i, ACTIVITY_REQUEST_CODE_BROWSEGPG);
+                GPGPreferenceFragment.this.startActivityForResult(i, ACTIVITY_REQUEST_CODE_BROWSE_GPG);
                 return true;
             });
             findPreference(getResources().getString(R.string.id_gpg_generate)).setOnPreferenceClickListener(preference -> {
@@ -550,14 +548,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         }
 
         private void DoExportKey() {
-            final File outFile = new File(getActivity().getCacheDir().getAbsolutePath() + "/secretkey.gpg");
+            final File outFile = new File(getActivity().getCacheDir().getAbsolutePath() + "/secret_key.gpg");
             try {
                 outFile.createNewFile();
-                FileOutputStream fout = new FileOutputStream(outFile);
+                FileOutputStream fileOut = new FileOutputStream(outFile);
                 InputStream keyContent = SettingsManager.GetGPGKeyContent(getActivity());
                 if (keyContent != null)
-                    FileUtils.pipe(keyContent, fout);
-                fout.close();
+                    FileUtils.pipe(keyContent, fileOut);
+                fileOut.close();
             } catch (IOException e) {
                 Toast.makeText(getActivity(), "Cannot prepare key for sharing: " + e.getMessage(), Toast.LENGTH_LONG).show();
                 log.log(Level.SEVERE, "Cannot write key to cache", e);
@@ -576,21 +574,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             startActivity(Intent.createChooser(shareIntent, getResources().getText(R.string.id_gpg_export)));
         }
 
-        private String GetFileName(Uri uri) {
-            String filename = uri.getLastPathSegment();
-            Cursor cu = getActivity().getContentResolver().query(uri, null, null, null, null);
-            if (cu != null) {
-                if (cu.moveToFirst()) {
-                    filename = cu.getString(cu.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME));
-                }
-                cu.close();
-            }
-            return filename;
-        }
-
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
-            if (requestCode == ACTIVITY_REQUEST_CODE_BROWSEGPG && resultCode == RESULT_OK) {
+            if (requestCode == ACTIVITY_REQUEST_CODE_BROWSE_GPG && resultCode == RESULT_OK) {
                 try {
                     final Uri intentData = data.getData();
                     boolean gpgImportStatus;
@@ -600,7 +586,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                         gpgImportStatus = false;
                     Toast.makeText(getActivity(), getResources().getString(gpgImportStatus ? R.string.gpg_import_ok : R.string.gpg_import_ko), Toast.LENGTH_LONG).show();
                 } catch (FileNotFoundException e) {
-                    Toast.makeText(getActivity(), getResources().getString(R.string.filenotfound), Toast.LENGTH_LONG).show();
+                    Toast.makeText(getActivity(), getResources().getString(R.string.file_not_found), Toast.LENGTH_LONG).show();
                     SettingsManager.RemoveGpgKey(getActivity());
                 }
                 updateGpgFileLabel();
@@ -609,11 +595,11 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 
         protected void updateGpgFileLabel() {
             if (SettingsManager.HasGPGKey(getActivity())) {
-                findPreference(getResources().getString(R.string.id_gpg_keyfile)).setSummary(GPGUtil.GetGPGKeyName(getActivity()));
+                findPreference(getResources().getString(R.string.id_gpg_key_file)).setSummary(GPGUtil.GetGPGKeyName(getActivity()));
                 findPreference(getResources().getString(R.string.id_gpg_password)).setEnabled(true);
                 findPreference(getResources().getString(R.string.id_gpg_export)).setEnabled(true);
             } else {
-                findPreference(getResources().getString(R.string.id_gpg_keyfile)).setSummary(R.string.pref_summary_gpg_keyfile);
+                findPreference(getResources().getString(R.string.id_gpg_key_file)).setSummary(R.string.pref_summary_gpg_key_file);
                 findPreference(getResources().getString(R.string.id_gpg_password)).setEnabled(false);
                 findPreference(getResources().getString(R.string.id_gpg_export)).setEnabled(false);
             }
@@ -640,7 +626,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                             AlertPromptGenerator.StaticMake(getActivity())
                                     .setTitle(R.string.update_password)
                                     .setView(new TextView(getActivity()).SetText(R.string.update_password_confirm))
-                                    .setPositiveButton(R.string.yes, (dialogInterface, view) -> FileMigrator.MigratePasswordToPassword(getActivity(), PasswordPickerFactory.GetPasswordPicker(getActivity())))
+                                    .setPositiveButton(R.string.yes, (dialogInterface, view) -> FileMigratoryUtils.MigratePasswordToPassword(getActivity(), PasswordPickerFactory.GetPasswordPicker(getActivity())))
                                     .setNegativeButton(R.string.no, null)
                                     .show();
                             return true;
@@ -656,7 +642,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         }
 
         private void UpdateSummary() {
-            findPreference(getString(R.string.id_pwd_password)).setSummary(SettingsManager.HasPassword(getActivity()) ? R.string.pref_summary_pwd_password : R.string.pref_summary_pwd_newpassword);
+            findPreference(getString(R.string.id_pwd_password)).setSummary(SettingsManager.HasPassword(getActivity()) ? R.string.pref_summary_pwd_password : R.string.pref_summary_pwd_new_password);
         }
     }
 }

app/src/main/java/info/knacki/pass/ui/EditPasswordActivity.java

@@ -41,7 +41,7 @@ public class EditPasswordActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.encryption_infos) {
+        if (item.getItemId() == R.id.encryption_information) {
             Intent i = new Intent(this, EncryptionInformationActivity.class);
             i.putExtra(EncryptionInformationActivity.FILE_PATH, fOutputFile.getAbsolutePath());
             startActivity(i);

app/src/main/java/info/knacki/pass/ui/EncryptionInformationActivity.java

@@ -13,7 +13,7 @@ import java.util.logging.Logger;
 
 import info.knacki.pass.R;
 import info.knacki.pass.io.FileInterfaceFactory;
-import info.knacki.pass.io.FileMigrator;
+import info.knacki.pass.io.FileMigratoryUtils;
 import info.knacki.pass.io.FileUtils;
 import info.knacki.pass.io.IFileInterface;
 import info.knacki.pass.io.OnResponseListener;
@@ -38,7 +38,7 @@ public class EncryptionInformationActivity extends AppCompatActivity {
         fEncrypted = new File(filePath);
         setContentView(R.layout.activity_encryption_infos);
 
-        findViewById(R.id.change_encmethod).setOnClickListener((v) -> {
+        findViewById(R.id.change_encryption_method).setOnClickListener((v) -> {
             RadioGroup radioGroup = new RadioGroup(EncryptionInformationActivity.this);
             final SettingsManager.EncryptionType prevEncType = FileInterfaceFactory.GetEncryptionType(fEncrypted);
 
@@ -63,7 +63,7 @@ public class EncryptionInformationActivity extends AppCompatActivity {
                             path += FileInterfaceFactory.GetExtension(newEncType);
                             File fileTo = new File(path);
                             log.info("Migrating from " +fEncrypted.getAbsolutePath() +" to " +path);
-                            FileMigrator.MigratePassword(EncryptionInformationActivity.this, fEncrypted, fileTo, PasswordPickerFactory.GetPasswordPicker(EncryptionInformationActivity.this), new OnResponseListener<Void>() {
+                            FileMigratoryUtils.MigratePassword(EncryptionInformationActivity.this, fEncrypted, fileTo, PasswordPickerFactory.GetPasswordPicker(EncryptionInformationActivity.this), new OnResponseListener<Void>() {
                                 @Override
                                 public void OnResponse(Void result) {
                                     fEncrypted = fileTo;
@@ -77,11 +77,10 @@ public class EncryptionInformationActivity extends AppCompatActivity {
                             }, true);
                         }
                     })
-                    .setTitle(R.string.change_encmethod)
+                    .setTitle(R.string.change_encryption_method)
                     .show();
         });
-        findViewById(R.id.remove).setOnClickListener((view) -> {
-            AlertPromptGenerator.StaticMake(this)
+        findViewById(R.id.remove).setOnClickListener(view -> AlertPromptGenerator.StaticMake(this)
                     .setTitle(R.string.are_you_sure)
                     .setView(new TextView(this).SetText(String.format(getString(R.string.about_to_rm_file), fEncrypted.getName())))
                     .setPositiveButton(R.string.ok, (dialogInterface, v) -> {
@@ -89,8 +88,7 @@ public class EncryptionInformationActivity extends AppCompatActivity {
                         EncryptionInformationActivity.this.finish();
                     })
                     .setNegativeButton(R.string.cancel, null)
-                    .show();
-        });
+                    .show());
         FillView();
     }
 

app/src/main/java/info/knacki/pass/ui/GitPullActivity.java

@@ -35,8 +35,9 @@ import info.knacki.pass.ui.alertPrompt.views.ConflictView;
 public class GitPullActivity extends AppCompatActivity {
     private final static Logger log = Logger.getLogger(GitPullActivity.class.getName());
     public final static String COMMIT_MSG = "Android pass sync";
+    public static String LOCAL_GIT_HASH_VERSION_FILE;
 
-    private GitInterface fGitInterfage;
+    private GitInterface fGitInterface;
     private GitCommit fHeadCommit;
 
     private void OnMsg(final String msg) {
@@ -54,14 +55,14 @@ public class GitPullActivity extends AppCompatActivity {
         setContentView(R.layout.activity_git_pull);
         setTitle(R.string.pref_vcs_git_pull);
 
-        if (null == versioning || !(versioning instanceof SettingsManager.Git)) {
+        if (!(versioning instanceof SettingsManager.Git)) {
             finish();
             return;
         }
-        LOCALGIT_HASH_VERSION_FILE = PathUtils.GetGitFile(this);
-        fGitInterfage = GitInterfaceFactory.factory(this, (SettingsManager.Git) versioning);
-        if (fGitInterfage != null) {
-            fGitInterfage.FetchHead(new OnStreamResponseListener<GitCommit>() {
+        LOCAL_GIT_HASH_VERSION_FILE = PathUtils.GetGitFile(this);
+        fGitInterface = GitInterfaceFactory.factory((SettingsManager.Git) versioning);
+        if (fGitInterface != null) {
+            fGitInterface.FetchHead(new OnStreamResponseListener<GitCommit>() {
                 @Override
                 public void OnMsg(final String msg) {
                     GitPullActivity.this.OnMsg(msg);
@@ -90,10 +91,8 @@ public class GitPullActivity extends AppCompatActivity {
         findViewById(R.id.close_bt).setOnClickListener(v -> GitPullActivity.this.finish());
     }
 
-    public static String LOCALGIT_HASH_VERSION_FILE;
-
     protected void OnTreeStructureFetched() {
-        final GitLocal localVersion = new GitLocal(new File(LOCALGIT_HASH_VERSION_FILE));
+        final GitLocal localVersion = new GitLocal(new File(LOCAL_GIT_HASH_VERSION_FILE));
         HashMap<String, GitObject.GitBlob> filesToPull = new HashMap<>();
         Set<String> filesToPush = new HashSet<>();
         HashMap<String, GitObject.GitBlob> conflictingFiles = new HashMap<>();
@@ -198,7 +197,7 @@ public class GitPullActivity extends AppCompatActivity {
                     pg.setIndeterminate(false);
                     pg.setMax(1);
                     pg.setProgress(1);
-                    localVersion.Write(new File(LOCALGIT_HASH_VERSION_FILE));
+                    localVersion.Write(new File(LOCAL_GIT_HASH_VERSION_FILE));
                     RmEmptyDirs(new File(PathUtils.GetPassDir(GitPullActivity.this)), true);
                     findViewById(R.id.close_bt).setEnabled(true);
                 });
@@ -284,7 +283,7 @@ public class GitPullActivity extends AppCompatActivity {
 
                 files.pop();
                 if (!files.empty()) {
-                    fGitInterfage.FetchBlob(files.peek().getValue(), this);
+                    fGitInterface.FetchBlob(files.peek().getValue(), this);
                 } else {
                     resp.OnResponse(null);
                 }
@@ -304,7 +303,7 @@ public class GitPullActivity extends AppCompatActivity {
                 DownloadNext(files, localCache, downloader, resp);
                 log.info("Removed file " +filename);
             } else {
-                fGitInterfage.FetchBlob(files.peek().getValue(), downloader);
+                fGitInterface.FetchBlob(files.peek().getValue(), downloader);
             }
         } else {
             resp.OnResponse(null);
@@ -339,7 +338,7 @@ public class GitPullActivity extends AppCompatActivity {
             final GitCommit.Builder commit = new GitCommit.Builder(fHeadCommit, config.GetUsername(), config.GetUserEmail(), COMMIT_MSG);
             for (String i : files)
                 commit.AddFile(i, new File(PathUtils.GetPassDir(this) + i));
-            fGitInterfage.PushBlobs(commit, new OnStreamResponseListener<Void>() {
+            fGitInterface.PushBlobs(commit, new OnStreamResponseListener<Void>() {
                 @Override
                 public void OnMsg(String message) {
                     resp.OnMsg(message);

app/src/main/java/info/knacki/pass/ui/MainActivity.java

@@ -269,7 +269,7 @@ public class MainActivity extends AppCompatActivity implements PasswordEditListe
     }
 
     @Override
-    public void OnEncryptionInfos(File f) {
+    public void OnEncryptionInformation(File f) {
         Intent i = new Intent(this, EncryptionInformationActivity.class);
         i.putExtra(EncryptionInformationActivity.FILE_PATH, f.getAbsolutePath());
         startActivity(i);

app/src/main/java/info/knacki/pass/ui/alertPrompt/AlertPrompt.java

@@ -88,12 +88,11 @@ public class AlertPrompt {
         return this;
     }
 
-    public AlertPrompt close() {
+    public void close() {
         if (fDialog != null) {
             fDialog.dismiss();
             fDialog = null;
         }
-        return this;
     }
 
     public AlertPrompt setPositiveButtonEnabled(boolean enabled) {

app/src/main/java/info/knacki/pass/ui/alertPrompt/ServiceAlertPrompt.java

@@ -18,11 +18,13 @@ public class ServiceAlertPrompt extends AlertPrompt {
     @Override
     protected void OnBeforeShow() {
         final Window window = fDialog.getWindow();
-        WindowManager.LayoutParams lay = window.getAttributes();
-        lay.token = fInputView.getWindowToken();
-        lay.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
-        window.setAttributes(lay);
-        window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        if (window != null) {
+            WindowManager.LayoutParams lay = window.getAttributes();
+            lay.token = fInputView.getWindowToken();
+            lay.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
+            window.setAttributes(lay);
+            window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        }
         final int hzPadding = fContext.getResources().getDimensionPixelSize(R.dimen.fab_margin);
         getView().setPadding(hzPadding, 0, hzPadding, 0);
     }

app/src/main/java/info/knacki/pass/ui/alertPrompt/integratedKeyboard/KeyboardWidget.java

@@ -10,7 +10,7 @@ import info.knacki.pass.R;
 public class KeyboardWidget extends KeyboardView implements KeyboardView.OnKeyboardActionListener {
     private final Keyboard fKeyboard;
     private Keyboard fNumberKeyboard;
-    private Keyboard fSymbsKeyboard;
+    private Keyboard fSymbolsKeyboard;
     private OnKeyListener fListener;
     private final Context fContext;
     private boolean fIsDisplayingLetters;
@@ -57,11 +57,10 @@ public class KeyboardWidget extends KeyboardView implements KeyboardView.OnKeybo
                 if (isShifted()) {
                     setKeyboard(fNumberKeyboard);
                 } else {
-                    if (fSymbsKeyboard == null)
-                        fSymbsKeyboard = new Keyboard(fContext, R.xml.qwerty_symbol_shift);
-                    setKeyboard(fSymbsKeyboard);
+                    if (fSymbolsKeyboard == null)
+                        fSymbolsKeyboard = new Keyboard(fContext, R.xml.qwerty_symbol_shift);
+                    setKeyboard(fSymbolsKeyboard);
                 }
-
             }
             setShifted(!isShifted());
         } else if (primaryCode == fContext.getResources().getInteger(R.integer.id_keyboard_delete)) {

app/src/main/java/info/knacki/pass/ui/alertPrompt/views/FingerprintView.java

@@ -1,6 +1,5 @@
 package info.knacki.pass.ui.alertPrompt.views;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.support.v7.widget.AppCompatImageView;
 import android.view.LayoutInflater;
@@ -14,8 +13,7 @@ public class FingerprintView extends LinearLayout {
 
     public FingerprintView(Context context) {
         super(context);
-        @SuppressLint("InflateParams") View v = LayoutInflater.from(context).inflate(R.layout.fingerprint_picker, null);
-        addView(v);
+        View v = LayoutInflater.from(context).inflate(R.layout.fingerprint_picker, this);
         image = v.findViewById(R.id.fingerprint_icon);
     }
 

app/src/main/java/info/knacki/pass/ui/alertPrompt/views/UsernameAndEmail.java

@@ -14,7 +14,7 @@ public class UsernameAndEmail extends ScrollView {
     public UsernameAndEmail(Context context) {
         super(context);
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        addView(inflater.inflate(R.layout.username_and_email, null));
+        inflater.inflate(R.layout.username_and_email, this);
         usernameEdit = findViewById(R.id.username);
         emailEdit = findViewById(R.id.email);
     }

app/src/main/java/info/knacki/pass/ui/passwordList/EditablePasswordListView.java

@@ -15,7 +15,7 @@ public class EditablePasswordListView<T extends Activity & PasswordEditListener>
         super(ctx, rootPath);
     }
 
-    protected void AddContextMenu(final FileIdent file, final PasswordView pv) {
+    protected void AddContextMenu(final FileIdentity file, final PasswordView pv) {
         if (file.isParent())
             return;
         pv.setOnLongClickListener(v -> {
@@ -29,7 +29,7 @@ public class EditablePasswordListView<T extends Activity & PasswordEditListener>
     }
 
     @Override
-    protected PasswordView CreateView(PasswordListView<T>.FileIdent file) {
+    protected PasswordView CreateView(FileIdentity file) {
         final PasswordView pv = super.CreateView(file);
         AddContextMenu(file, pv);
         return pv;
@@ -42,18 +42,18 @@ public class EditablePasswordListView<T extends Activity & PasswordEditListener>
         switch (item.getItemId()) {
             case R.id.remove:
                 if (fSelectedPassword.IsDir()) {
-                    fClickListener.OnRemoveDirectory(new File(fCurrentDir + "/" + fSelectedPassword.fFullname));
+                    fClickListener.OnRemoveDirectory(new File(fCurrentDir + "/" + fSelectedPassword.fFullName));
                 } else {
-                    fClickListener.OnRemovePassword(new File(fCurrentDir + "/" + fSelectedPassword.fFullname));
+                    fClickListener.OnRemovePassword(new File(fCurrentDir + "/" + fSelectedPassword.fFullName));
                 }
                 break;
 
-            case R.id.encryption_infos:
-                fClickListener.OnEncryptionInfos(new File(fCurrentDir +"/" +fSelectedPassword.fFullname));
+            case R.id.encryption_information:
+                fClickListener.OnEncryptionInformation(new File(fCurrentDir +"/" +fSelectedPassword.fFullName));
                 break;
 
             case R.id.clipboard:
-                fClickListener.OnCopyToClipboard(new File(fCurrentDir +"/" +fSelectedPassword.fFullname));
+                fClickListener.OnCopyToClipboard(new File(fCurrentDir +"/" +fSelectedPassword.fFullName));
                 break;
 
             default:

app/src/main/java/info/knacki/pass/ui/passwordList/PasswordEditListener.java

@@ -5,6 +5,6 @@ import java.io.File;
 public interface PasswordEditListener extends PasswordClickListener {
     void OnRemovePassword(File f);
     void OnRemoveDirectory(File f);
-    void OnEncryptionInfos(File f);
+    void OnEncryptionInformation(File f);
     void OnCopyToClipboard(File f);
 }

app/src/main/java/info/knacki/pass/ui/passwordList/PasswordListView.java

@@ -13,17 +13,17 @@ public class PasswordListView<T extends Context & PasswordClickListener> extends
     public String fCurrentDir;
     protected final T fClickListener;
 
-    class FileIdent implements Comparable<FileIdent> {
+    class FileIdentity implements Comparable<FileIdentity> {
         final boolean fIsDir;
         final String fName;
         private boolean fParent = false;
 
-        FileIdent(boolean isDir, String name) {
+        FileIdentity(boolean isDir, String name) {
             fIsDir = isDir;
             fName = name;
         }
 
-        public FileIdent setParent() {
+        public FileIdentity setParent() {
             fParent = true;
             return this;
         }
@@ -33,12 +33,12 @@ public class PasswordListView<T extends Context & PasswordClickListener> extends
         }
 
         @Override
-        public int compareTo(@NonNull FileIdent fileIdent) {
-            if (fIsDir && !fileIdent.fIsDir)
+        public int compareTo(@NonNull FileIdentity fileIdentity) {
+            if (fIsDir && !fileIdentity.fIsDir)
                 return -1;
-            if (!fIsDir && fileIdent.fIsDir)
+            if (!fIsDir && fileIdentity.fIsDir)
                 return 1;
-            return fName.compareTo(fileIdent.fName);
+            return fName.compareTo(fileIdentity.fName);
         }
     }
 
@@ -47,7 +47,7 @@ public class PasswordListView<T extends Context & PasswordClickListener> extends
         return this;
     }
 
-    protected PasswordView CreateView(final FileIdent file) {
+    protected PasswordView CreateView(final FileIdentity file) {
         PasswordView pv = new PasswordView(getContext(), file.fIsDir ? ((file.isParent() ? PasswordView.TYPE_PARENT : 0) | PasswordView.TYPE_DIR) : PasswordView.TYPE_PASSWORD, file.fName);
         pv.setOnClickListener(view -> {
             File f = new File(fCurrentDir +"/" +file.fName);
@@ -94,17 +94,17 @@ public class PasswordListView<T extends Context & PasswordClickListener> extends
 
     protected void DisplayDir(final File f) {
         ClearView();
-        SortedSet<FileIdent> files = new TreeSet<>();
+        SortedSet<FileIdentity> files = new TreeSet<>();
 
         File[] fileArr = f.listFiles();
         if (fileArr != null)
             for (File i: fileArr)
                 if (IsAccessGranted(i))
-                    files.add(new FileIdent(i.isDirectory(), i.getName()));
+                    files.add(new FileIdentity(i.isDirectory(), i.getName()));
         if (!f.getAbsolutePath().equals(fRootPath)) {
-            addView(CreateView(new FileIdent(true, "Parent").setParent()));
+            addView(CreateView(new FileIdentity(true, "Parent").setParent()));
         }
-        for (FileIdent i: files)
+        for (FileIdentity i: files)
             addView(CreateView(i));
         fCurrentDir = f.getAbsolutePath();
     }

app/src/main/java/info/knacki/pass/ui/passwordList/PasswordView.java

@@ -14,7 +14,7 @@ public class PasswordView extends LinearLayout {
     protected final ImageView vIcon;
     protected final TextView vName;
     protected final int fType;
-    protected final String fFullname;
+    protected final String fFullName;
 
     public static final int TYPE_DIR = 1;
     public static final int TYPE_PARENT = 2;
@@ -22,7 +22,7 @@ public class PasswordView extends LinearLayout {
 
     public PasswordView(Context ctx, int type, String name) {
         super(ctx);
-        fFullname = name;
+        fFullName = name;
         vIcon = new ImageView(ctx);
         fType = type;
         if ((type & TYPE_PARENT) != 0)

app/src/main/java/info/knacki/pass/ui/passwordPicker/FingerprintPicker.java

@@ -202,7 +202,7 @@ class FingerprintPicker extends PasswordPicker {
         final FingerprintView fingerprintView = new FingerprintView(fContext);
         fDisplayingPrompt = fAlertFactory.Generate(fContext)
                 .setView(fingerprintView)
-                .setTitle(R.string.pushfinger)
+                .setTitle(R.string.push_finger)
                 .setNegativeButton(R.string.cancel, (dialogInterface, view) -> {
                     fDisplayingPrompt = null;
                     signal.cancel();
@@ -223,7 +223,7 @@ class FingerprintPicker extends PasswordPicker {
 
             @Override
             public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
-                log.severe("Authentification help " +helpString);
+                log.severe("Authentication help " +helpString);
                 super.onAuthenticationHelp(helpMsgId, helpString);
             }
 
@@ -303,7 +303,6 @@ class FingerprintPicker extends PasswordPicker {
         FingerprintPicker.super.GetPassword(savePassword ? new FileInterfaceFactory.OnPasswordEnteredListener() {
             @Override
             public boolean OnResponse(String result) {
-                // TODO checkbox save password ?
                 if (result != null) {
                     AddPassword(result);
                 }

app/src/main/java/info/knacki/pass/ui/passwordPicker/PasswordPicker.java

@@ -112,7 +112,7 @@ class PasswordPicker implements FileInterfaceFactory.PasswordGetter {
                     SetStep(eStep.eNewPassword).GetPassword(fListener);
                     return false;
                 } else if (!fFirstPassword.equals(result)) {
-                    Toast.makeText(fContext, fContext.getResources().getString(R.string.password_missmatch), Toast.LENGTH_LONG).show();
+                    Toast.makeText(fContext, fContext.getResources().getString(R.string.password_mismatch), Toast.LENGTH_LONG).show();
                     SetStep(eStep.eNewPassword).GetPassword(fListener);
                     return false;
                 }

app/src/main/java/info/knacki/pass/ui/widget/Checkbox.java

@@ -28,9 +28,7 @@ public class Checkbox extends LinearLayout implements Checkable {
         addView(fTextView);
         fTextView.setText(text);
         parent.addView(this);
-        setOnClickListener(view -> {
-            toggle();
-        });
+        setOnClickListener(view -> toggle());
         setChecked(false);
         fCheckedChangeListener = onCheckedChangeListener;
     }

app/src/main/res/layout/activity_encryption_infos.xml

@@ -15,7 +15,7 @@
         android:layout_row="1" android:layout_rowSpan="2" android:layout_column="0" />
     <android.support.v7.widget.AppCompatTextView android:id="@+id/enc_method"
         android:layout_row="1" android:layout_column="1" />
-    <android.support.v7.widget.AppCompatButton android:id="@+id/change_encmethod" android:text="@string/change"
+    <android.support.v7.widget.AppCompatButton android:id="@+id/change_encryption_method" android:text="@string/change"
         android:layout_row="2" android:layout_column="1" />
 
     <android.support.v7.widget.AppCompatTextView android:text="@string/remove"

app/src/main/res/layout/fingerprint_picker.xml

@@ -12,5 +12,5 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/big_icon_height"
         android:gravity="center_vertical"
-        android:text="@string/pushfinger_desc"/>
+        android:text="@string/push_finger_desc"/>
 </LinearLayout>

app/src/main/res/layout/username_and_email.xml

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
     <android.support.v7.widget.AppCompatTextView
-        android:text="@string/pref_gpg_usermail"
+        android:text="@string/pref_gpg_user_mail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
     <android.support.v7.widget.AppCompatEditText

app/src/main/res/menu/context_file_menu.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/clipboard" android:title="@string/copy_clipboard"/>
-    <item android:id="@+id/encryption_infos" android:title="@string/encryption_infos"/>
+    <item android:id="@+id/encryption_information" android:title="@string/encryption_information"/>
     <item android:id="@+id/remove" android:title="@string/remove"/>
 </menu>

app/src/main/res/menu/editpassword_menu.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_info_black_24dp" android:title="@string/encryption_infos" android:id="@+id/encryption_infos" app:showAsAction="always"/>
+    <item android:icon="@drawable/ic_info_black_24dp" android:title="@string/encryption_information" android:id="@+id/encryption_information" app:showAsAction="always"/>
 </menu>

app/src/main/res/values-fr/lang.xml

@@ -19,26 +19,26 @@
     <string name="cancelled">Annulé</string>
     <string name="ChangeKeyboard">Revenir au clavier</string>
     <string name="settings">Configuration</string>
-    <string name="encryption_infos">Méthode de chiffrement</string>
+    <string name="encryption_information">Méthode de chiffrement</string>
     <string name="encryption_method">Méthode de chiffrement</string>
     <string name="pref_title_system_keyboard_settings">Paramètres système du clavier</string>
     <string name="pref_header_general">Général</string>
     <string name="pref_header_Encryption">Chiffrement</string>
     <string name="pref_header_VCS">VCS</string>
-    <string name="pref_title_enctype">Méthode de chiffrement</string>
+    <string name="pref_title_enc_type">Méthode de chiffrement</string>
     <string name="pref_vcs_url">Addresse du dépot git</string>
     <string name="pref_vcs_git_user_title">Nom d\'utilisateur</string>
     <string name="pref_vcs_git_pass_title">Mot de passe</string>
     <string name="pref_vcs_branch_title">Branche GIT</string>
     <string name="pref_vcs_git_pull">Git pull</string>
-    <string name="pref_vcs_git_authcategory">Authentication</string>
-    <string name="pref_vcs_git_commitinfocategory">Informations de commit</string>
+    <string name="pref_vcs_git_auth_category">Authentication</string>
+    <string name="pref_vcs_git_commit_info_category">Informations de commit</string>
     <string name="pref_vcs_git_username_title">Nom d\'utilisateur</string>
-    <string name="pref_vcs_git_useremail_title">Adresse email</string>
+    <string name="pref_vcs_git_user_email_title">Adresse email</string>
     <string name="pref_header_GPG">Configuration de GPG</string>
-    <string name="pref_enctype_title_none">Pas de chiffrement</string>
-    <string name="pref_enctype_title_gpg">GPG</string>
-    <string name="pref_enctype_title_password">Mot de passe</string>
+    <string name="pref_enc_type_title_none">Pas de chiffrement</string>
+    <string name="pref_enc_type_title_gpg">GPG</string>
+    <string name="pref_enc_type_title_password">Mot de passe</string>
     <string name="pref_vcs_title">Autoriser la gestion de version</string>
     <string name="pref_vcs_enable">pref_vcs_enable</string>
     <string name="pref_vcs_list_title">Outil de gestion de version</string>
@@ -52,15 +52,15 @@
         <item>Fort</item>
         <item>Personalisé</item>
     </array>
-    <string name="pref_summary_keyboard_enabled"></string>
+    <string name="pref_summary_keyboard_enabled"> </string>
     <string name="pref_summary_enable_keyboard">Autoriser le clavier pour la saisie des mots de passes</string>
     <string name="pref_gpg_title_username_mail">Username</string>
     <string name="pref_gpg_username">Username</string>
-    <string name="pref_gpg_usermail">Mail Address</string>
+    <string name="pref_gpg_user_mail">Mail Address</string>
     <string name="pref_header_gpg_generate">Générer une clé GPG</string>
     <string name="pref_summary_gpg_generate">Générer une nouvelle paire de clé GPG</string>
-    <string name="pref_header_gpg_keyfile">Clé GPG</string>
-    <string name="pref_summary_gpg_keyfile">Rechercher une clé GPG</string>
+    <string name="pref_header_gpg_key_file">Clé GPG</string>
+    <string name="pref_summary_gpg_key_file">Rechercher une clé GPG</string>
     <string name="pref_header_gpg_password">Mot de passe de la clef GPG</string>
     <string name="pref_summary_gpg_password">Changer le mot de passe GPG</string>
     <string name="enter_password">Mot de passe</string>
@@ -78,8 +78,8 @@
     <string name="copied_clipboard">Mot de passe dans le presse-papier</string>
     <string name="gpg_import_ok">Clé GPG importée avec succès</string>
     <string name="gpg_import_ko">Erreur lors de l\'import de la clé GPG</string>
-    <string name="filenotfound">Fichier introuvable</string>
-    <string name="password_missmatch">Les mots de passes ne correspondent pas. Veuillez rééssayer</string>
+    <string name="file_not_found">Fichier introuvable</string>
+    <string name="password_mismatch">Les mots de passes ne correspondent pas. Veuillez rééssayer</string>
     <string name="enter_old_password">Saisissez l\'ancien mot de passe</string>
     <string name="type_new_password">Saisissez le nouveau mot de passe</string>
     <string name="retype_new_password">Saisissez de nouveau le nouveau mot de passe</string>
@@ -92,16 +92,16 @@
     <string name="pref_header_gpg_export">Export GPG key</string>
     <string name="sync">Synchroniser</string>
     <string name="close">Fermer</string>
-    <string name="pushfinger">Lecture d\'empreinte</string>
-    <string name="pushfinger_desc">Touchez le capteur avec le bout de votre doigt</string>
+    <string name="push_finger">Lecture d\'empreinte</string>
+    <string name="push_finger_desc">Touchez le capteur avec le bout de votre doigt</string>
     <string name="fingerprint_init_error">Erreur lors de l\'initialisation du lecteur d\'empreintes.</string>
     <string name="pref_header_password">Configuration de Mot de Passs</string>
     <string name="pref_header_pwd_password">Mot de passe</string>
-    <string name="pref_summary_pwd_newpassword">Choisir un mot de passe</string>
+    <string name="pref_summary_pwd_new_password">Choisir un mot de passe</string>
     <string name="pref_summary_pwd_password">Changer le mot de passe</string>
     <string name="update_password">Changement de mot de passe </string>
     <string name="update_password_confirm">Ce mot de passe sera maintenant utilisé pour les nouveaux mots de passes. Voulez-vous mettre à jours vos mots de passes ?</string>
     <string name="path">Fichier</string>
     <string name="change">Changer</string>
-    <string name="change_encmethod">Changer la méthode de chiffrement</string>
+    <string name="change_encryption_method">Changer la méthode de chiffrement</string>
 </resources>

app/src/main/res/values/lang.xml

@@ -19,16 +19,16 @@
     <string name="cancelled">Cancelled</string>
     <string name="ChangeKeyboard">Change keyboard</string>
     <string name="settings">Settings</string>
-    <string name="encryption_infos">Encryption</string>
+    <string name="encryption_information">Encryption</string>
     <string name="encryption_method">Encryption Method</string>
     <string name="pref_title_system_keyboard_settings">Keyboard system settings</string>
     <string name="pref_header_general">General</string>
     <string name="pref_header_Encryption">Encryption</string>
     <string name="pref_header_VCS">VCS</string>
-    <string name="pref_title_enctype">Encryption type</string>
-    <string name="pref_enctype_title_none">No encryption</string>
-    <string name="pref_enctype_title_gpg">GPG</string>
-    <string name="pref_enctype_title_password">Password</string>
+    <string name="pref_title_enc_type">Encryption type</string>
+    <string name="pref_enc_type_title_none">No encryption</string>
+    <string name="pref_enc_type_title_gpg">GPG</string>
+    <string name="pref_enc_type_title_password">Password</string>
     <string name="pref_vcs_title">Enable password versioning</string>
     <string name="pref_vcs_enable">pref_vcs_enable</string>
     <string name="pref_vcs_list_title">Versioning tool</string>
@@ -37,10 +37,10 @@
     <string name="pref_vcs_git_pass_title">Password</string>
     <string name="pref_vcs_branch_title">Git branch</string>
     <string name="pref_vcs_git_pull">Git pull</string>
-    <string name="pref_vcs_git_authcategory">Authentication</string>
-    <string name="pref_vcs_git_commitinfocategory">Commit information</string>
+    <string name="pref_vcs_git_auth_category">Authentication</string>
+    <string name="pref_vcs_git_commit_info_category">Commit information</string>
     <string name="pref_vcs_git_username_title">Username</string>
-    <string name="pref_vcs_git_useremail_title">Mail address</string>
+    <string name="pref_vcs_git_user_email_title">Mail address</string>
     <string name="pref_header_GPG">GPG settings</string>
     <array name="pref_vcs_list_keys">
         <item>GIT</item>
@@ -56,11 +56,11 @@
     <string name="pref_summary_enable_keyboard">Allow pass keyboard</string>
     <string name="pref_gpg_title_username_mail">Username</string>
     <string name="pref_gpg_username">Username</string>
-    <string name="pref_gpg_usermail">Addresse Mail</string>
+    <string name="pref_gpg_user_mail">Mail Address</string>
     <string name="pref_header_gpg_generate">Generate GPG Key</string>
     <string name="pref_summary_gpg_generate">Generate a new GPG key pair</string>
-    <string name="pref_header_gpg_keyfile">GPG key</string>
-    <string name="pref_summary_gpg_keyfile">Browse to find GPG exported key</string>
+    <string name="pref_header_gpg_key_file">GPG key</string>
+    <string name="pref_summary_gpg_key_file">Browse to find GPG exported key</string>
     <string name="pref_header_gpg_password">GPG key password</string>
     <string name="pref_summary_gpg_password">Change GPG password</string>
     <string name="enter_password">Enter password</string>
@@ -78,8 +78,8 @@
     <string name="copied_clipboard">Password copied to Clipboard</string>
     <string name="gpg_import_ok">Done importing GPG Key</string>
     <string name="gpg_import_ko">Error while importing GPG Key</string>
-    <string name="filenotfound">Error: file not found</string>
-    <string name="password_missmatch">Password missmatch. Please try again</string>
+    <string name="file_not_found">Error: file not found</string>
+    <string name="password_mismatch">Password mismatch. Please try again</string>
     <string name="enter_old_password">Enter old password</string>
     <string name="type_new_password">Enter new password</string>
     <string name="retype_new_password">Retype new password</string>
@@ -92,16 +92,16 @@
     <string name="pref_header_gpg_export">Export GPG key</string>
     <string name="sync">Synchronize</string>
     <string name="close">Close</string>
-    <string name="pushfinger">Fingerprint reader</string>
-    <string name="pushfinger_desc">Touch the fingerprint reader with the tip or your finger</string>
+    <string name="push_finger">Fingerprint reader</string>
+    <string name="push_finger_desc">Touch the fingerprint reader with the tip or your finger</string>
     <string name="fingerprint_init_error">Error during fingerprint initialization</string>
     <string name="pref_header_password">Password settings</string>
     <string name="pref_header_pwd_password">Password</string>
-    <string name="pref_summary_pwd_newpassword">Choose a password</string>
+    <string name="pref_summary_pwd_new_password">Choose a password</string>
     <string name="pref_summary_pwd_password">Change password</string>
     <string name="update_password">Update master password</string>
     <string name="update_password_confirm">This password will now be used for new passwords. Do you want to update your password encoded data with this master password ?</string>
     <string name="path">File</string>
     <string name="change">Change</string>
-    <string name="change_encmethod">Change encryption method</string>
+    <string name="change_encryption_method">Change encryption method</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,36 +1,28 @@
 <resources>
-    <string name="app_name">pass</string>
-    <string-array name="pref_enctype_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    <integer name="method_raw">0</integer>
-    <integer name="method_GPG">1</integer>
-    <integer name="method_pass">2</integer>
+    <string name="app_name" translatable="false">pass</string>
     <string-array name="pref_vcs_list_values">
         <item>0</item>
     </string-array>
-    <string name="id_softSettings">id_softSettings</string>
-    <string name="id_enctype">id_enctype</string>
-    <string name="id_pref_enctype_fingerprint">id_pref_enctype_fingerprint</string>
-    <string name="id_vcs_enable">id_vcs_enable</string>
-    <string name="id_vcs_list">id_vcs_list</string>
-    <string name="id_vcs_git_url">id_vcs_git_url</string>
-    <string name="id_vcs_git_user">id_vcs_git_user</string>
-    <string name="id_vcs_git_pass">id_vcs_git_pass</string>
-    <string name="id_vcs_git_branches">id_vcs_git_branches</string>
-    <string name="id_vcs_git_pull">id_vcs_git_pull</string>
-    <string name="id_vcs_git_ci_username">id_vcs_git_ci_username</string>
-    <string name="id_vcs_git_ci_useremail">id_vcs_git_ci_useremail</string>
-    <string name="id_vcs_git_commitinfocategory">id_vcs_git_commitinfocategory</string>
-    <string name="id_vcs_git_authcategory">id_vcs_git_authcategory</string>
-    <string name="id_gpg_generate">id_gpg_generate</string>
-    <string name="id_gpg_keyfile">id_gpg_keyfile</string>
-    <string name="id_gpg_password">id_gpg_password</string>
-    <string name="id_gpg_export">id_gpg_export</string>
-    <string name="id_pwd_password">id_pwd_password</string>
-    <integer name="id_keyboard_numbers">-2</integer>
-    <integer name="id_keyboard_shift">-1</integer>
-    <integer name="id_keyboard_delete">-5</integer>
+    <string name="id_softSettings" translatable="false">id_softSettings</string>
+    <string name="id_enc_type" translatable="false">id_enc_type</string>
+    <string name="id_pref_enc_type_fingerprint" translatable="false">id_pref_enc_type_fingerprint</string>
+    <string name="id_vcs_enable" translatable="false">id_vcs_enable</string>
+    <string name="id_vcs_list" translatable="false">id_vcs_list</string>
+    <string name="id_vcs_git_url" translatable="false">id_vcs_git_url</string>
+    <string name="id_vcs_git_user" translatable="false">id_vcs_git_user</string>
+    <string name="id_vcs_git_pass" translatable="false">id_vcs_git_pass</string>
+    <string name="id_vcs_git_branches" translatable="false">id_vcs_git_branches</string>
+    <string name="id_vcs_git_pull" translatable="false">id_vcs_git_pull</string>
+    <string name="id_vcs_git_ci_username" translatable="false">id_vcs_git_ci_username</string>
+    <string name="id_vcs_git_ci_user_email" translatable="false">id_vcs_git_ci_user_email</string>
+    <string name="id_vcs_git_commit_info_category" translatable="false">id_vcs_git_commit_info_category</string>
+    <string name="id_vcs_git_auth_category" translatable="false">id_vcs_git_auth_category</string>
+    <string name="id_gpg_generate" translatable="false">id_gpg_generate</string>
+    <string name="id_gpg_key_file" translatable="false">id_gpg_key_file</string>
+    <string name="id_gpg_password" translatable="false">id_gpg_password</string>
+    <string name="id_gpg_export" translatable="false">id_gpg_export</string>
+    <string name="id_pwd_password" translatable="false">id_pwd_password</string>
+    <integer name="id_keyboard_numbers" translatable="false">-2</integer>
+    <integer name="id_keyboard_shift" translatable="false">-1</integer>
+    <integer name="id_keyboard_delete" translatable="false">-5</integer>
 </resources>

app/src/main/res/values/styles.xml

@@ -1,5 +1,4 @@
 <resources>
-
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
@@ -7,14 +6,4 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
 </resources>

app/src/main/res/xml/pref_enc_password.xml

@@ -2,5 +2,5 @@
     <Preference
         android:key="@string/id_pwd_password"
         android:title="@string/pref_header_pwd_password"
-        android:summary="@string/pref_summary_pwd_newpassword"/>
+        android:summary="@string/pref_summary_pwd_new_password"/>
 </PreferenceScreen>

app/src/main/res/xml/pref_encryption.xml

@@ -5,10 +5,10 @@
     <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
     <ListPreference
         android:defaultValue="180"
-        android:key="@string/id_enctype"
+        android:key="@string/id_enc_type"
         android:negativeButtonText="@null"
         android:positiveButtonText="@null"
-        android:title="@string/pref_title_enctype" />
+        android:title="@string/pref_title_enc_type" />
     <PreferenceScreen
         android:fragment="info.knacki.pass.settings.ui.SettingsActivity$GPGPreferenceFragment"
         android:title="@string/pref_header_GPG" />
@@ -16,7 +16,7 @@
         android:fragment="info.knacki.pass.settings.ui.SettingsActivity$PasswordPreferenceFragment"
         android:title="@string/pref_header_password" />
     <SwitchPreference
-        android:key="@string/id_pref_enctype_fingerprint"
-        android:title="@string/pushfinger"
+        android:key="@string/id_pref_enc_type_fingerprint"
+        android:title="@string/push_finger"
         android:icon="@drawable/ic_fingerprint" />
 </PreferenceScreen>

app/src/main/res/xml/pref_gpg.xml

@@ -5,9 +5,9 @@
         android:summary="@string/pref_summary_gpg_generate"
         />
     <Preference
-        android:key="@string/id_gpg_keyfile"
-        android:title="@string/pref_header_gpg_keyfile"
-        android:summary="@string/pref_summary_gpg_keyfile"
+        android:key="@string/id_gpg_key_file"
+        android:title="@string/pref_header_gpg_key_file"
+        android:summary="@string/pref_summary_gpg_key_file"
         />
     <Preference
         android:key="@string/id_gpg_password"

app/src/main/res/xml/pref_vcs.xml

@@ -19,8 +19,8 @@
         />
 
     <PreferenceCategory
-        android:title="@string/pref_vcs_git_authcategory"
-        android:key="@string/id_vcs_git_authcategory"/>
+        android:title="@string/pref_vcs_git_auth_category"
+        android:key="@string/id_vcs_git_auth_category"/>
     <EditTextPreference
         android:key="@string/id_vcs_git_user"
         android:title="@string/pref_vcs_git_user_title"/>
@@ -30,8 +30,8 @@
         android:inputType="textPassword"/>
 
     <PreferenceCategory
-        android:title="@string/pref_vcs_git_commitinfocategory"
-        android:key="@string/id_vcs_git_commitinfocategory"/>
+        android:title="@string/pref_vcs_git_commit_info_category"
+        android:key="@string/id_vcs_git_commit_info_category"/>
     <ListPreference
         android:key="@string/id_vcs_git_branches"
         android:title="@string/pref_vcs_branch_title"
@@ -40,8 +40,8 @@
         android:key="@string/id_vcs_git_ci_username"
         android:title="@string/pref_vcs_git_username_title"/>
     <EditTextPreference
-        android:key="@string/id_vcs_git_ci_useremail"
-        android:title="@string/pref_vcs_git_useremail_title"/>
+        android:key="@string/id_vcs_git_ci_user_email"
+        android:title="@string/pref_vcs_git_user_email_title"/>
 
     <Preference android:title="@string/pref_vcs_git_pull" android:key="@string/id_vcs_git_pull" />
 </PreferenceScreen>