diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2019-10-02 18:04:18 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 18:04:18 +0530 |
| commit | f1f59dc1ed26c2351dc31e55902ff8e4b5a6ed0e (patch) | |
| tree | 2afb98c921714ccefcd22f35a7340584d1bfba53 /app/src/main/java/com/zeapo/pwdstore/pwgen | |
| parent | 9a1a54a6fcfa6fd6cf142f2af9804375255d14cf (diff) | |
| download | HardenedPass-f1f59dc1ed26c2351dc31e55902ff8e4b5a6ed0e.tar.gz HardenedPass-f1f59dc1ed26c2351dc31e55902ff8e4b5a6ed0e.zip | |
Add Spotless to regulate codestyle (#550)
* Add Spotless to regulate codestyle
* treewide: Run spotless
* Add spotlessCheck to CI test
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/pwgen')
3 files changed, 11 insertions, 14 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt b/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt index 29d2dd73..09988ad1 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt @@ -5,7 +5,6 @@ import com.zeapo.pwdstore.R import java.util.ArrayList - object PasswordGenerator { internal const val DIGITS = 0x0001 internal const val UPPERS = 0x0002 @@ -27,9 +26,9 @@ object PasswordGenerator { /** * Sets password generation preferences. * - * @param ctx context from which to retrieve SharedPreferences from + * @param ctx context from which to retrieve SharedPreferences from * preferences file 'PasswordGenerator' - * @param argv options for password generation + * @param argv options for password generation * <table summary="options for password generation"> * <tr><td>Option</td><td>Description</td></tr> * <tr><td>0</td><td>don't include numbers</td></tr> @@ -102,7 +101,7 @@ object PasswordGenerator { phonemes = false pwgenFlags = pwgenFlags or NO_VOWELS // | DIGITS | UPPERS; } - }// pwgenFlags = DIGITS | UPPERS; + } // pwgenFlags = DIGITS | UPPERS; } } @@ -128,7 +127,6 @@ object PasswordGenerator { phonemes = false } - val passwords = ArrayList<String>() val num = prefs.getInt("num", 1) for (i in 0 until num) { @@ -143,4 +141,3 @@ object PasswordGenerator { class PasswordGeneratorExeption(string: String) : Exception(string) } - diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/Phonemes.kt b/app/src/main/java/com/zeapo/pwdstore/pwgen/Phonemes.kt index 98e9bfe4..f4477681 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/Phonemes.kt +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/Phonemes.kt @@ -56,7 +56,7 @@ internal object Phonemes { /** * Generates a human-readable password. * - * @param size length of password to generate + * @param size length of password to generate * @param pwFlags flag field where set bits indicate conditions the * generated password must meet * <table summary="bits of flag field"> @@ -105,8 +105,8 @@ internal object Phonemes { continue } // Don't allow VOWEL followed a Vowel/Dipthong pair - if (prev and VOWEL > 0 && flags and VOWEL > 0 - && flags and DIPTHONG > 0 + if (prev and VOWEL > 0 && flags and VOWEL > 0 && + flags and DIPTHONG > 0 ) { continue } @@ -200,8 +200,8 @@ internal object Phonemes { shouldBe = if (shouldBe == CONSONANT) { VOWEL } else { - if (prev and VOWEL > 0 || flags and DIPTHONG > 0 - || RandomNumberGenerator.number(10) > 3 + if (prev and VOWEL > 0 || flags and DIPTHONG > 0 || + RandomNumberGenerator.number(10) > 3 ) { CONSONANT } else { diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt b/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt index e3ae3397..f37267b8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt @@ -5,7 +5,7 @@ internal object RandomPasswordGenerator { /** * Generates a completely random password. * - * @param size length of password to generate + * @param size length of password to generate * @param pwFlags flag field where set bits indicate conditions the * generated password must meet * <table summary ="bits of flag field"> @@ -48,8 +48,8 @@ internal object RandomPasswordGenerator { num = RandomNumberGenerator.number(bank.length) cha = bank.toCharArray()[num] character = cha.toString() - if (pwFlags and PasswordGenerator.AMBIGUOUS > 0 - && PasswordGenerator.AMBIGUOUS_STR.contains(character)) { + if (pwFlags and PasswordGenerator.AMBIGUOUS > 0 && + PasswordGenerator.AMBIGUOUS_STR.contains(character)) { continue } if (pwFlags and PasswordGenerator.NO_VOWELS > 0 && PasswordGenerator.VOWELS_STR.contains(character)) { |
