From f1f59dc1ed26c2351dc31e55902ff8e4b5a6ed0e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 2 Oct 2019 18:04:18 +0530 Subject: Add Spotless to regulate codestyle (#550) * Add Spotless to regulate codestyle * treewide: Run spotless * Add spotlessCheck to CI test Signed-off-by: Harsh Shandilya --- .../main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt | 9 +++------ app/src/main/java/com/zeapo/pwdstore/pwgen/Phonemes.kt | 10 +++++----- .../java/com/zeapo/pwdstore/pwgen/RandomPasswordGenerator.kt | 6 +++--- 3 files changed, 11 insertions(+), 14 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/pwgen') 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 * * * @@ -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() 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 *
OptionDescription
0don't include numbers
@@ -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 *
@@ -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)) { -- cgit v1.2.3