diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2020-04-21 13:11:27 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-04-21 15:55:25 +0530 |
| commit | d505151662da1c9a9d9ce5434db2a370d4167e36 (patch) | |
| tree | e0a3fdafc56c07dba5980ae92b1a76477992f97b /app/src/main/java/com/zeapo/pwdstore/pwgen | |
| parent | e1921b26e0fdc9d4fdb9df2f31278aba051edf0f (diff) | |
| download | HardenedPass-d505151662da1c9a9d9ce5434db2a370d4167e36.tar.gz HardenedPass-d505151662da1c9a9d9ce5434db2a370d4167e36.zip | |
treewide: use edit extension and cleanup some deprecation
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/pwgen')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt | 39 |
1 files changed, 19 insertions, 20 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 de9e1e7b..9f7faa56 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/PasswordGenerator.kt @@ -5,6 +5,7 @@ package com.zeapo.pwdstore.pwgen import android.content.Context +import androidx.core.content.edit import com.zeapo.pwdstore.R import java.util.ArrayList @@ -50,28 +51,26 @@ object PasswordGenerator { */ @JvmStatic fun setPrefs(ctx: Context, argv: ArrayList<String>, vararg numArgv: Int): Boolean { - val prefs = ctx.getSharedPreferences("PasswordGenerator", Context.MODE_PRIVATE) - val editor = prefs.edit() - - for (option in pwOptions.toCharArray()) { - if (argv.contains(option.toString())) { - editor.putBoolean(option.toString(), true) - argv.remove(option.toString()) - } else { - editor.putBoolean(option.toString(), false) + ctx.getSharedPreferences("PasswordGenerator", Context.MODE_PRIVATE).edit { + for (option in pwOptions.toCharArray()) { + if (argv.contains(option.toString())) { + putBoolean(option.toString(), true) + argv.remove(option.toString()) + } else { + putBoolean(option.toString(), false) + } } - } - var i = 0 - while (i < numArgv.size && i < 2) { - if (numArgv[i] <= 0) { - // Invalid password length or number of passwords - return false + var i = 0 + while (i < numArgv.size && i < 2) { + if (numArgv[i] <= 0) { + // Invalid password length or number of passwords + return false + } + val name = if (i == 0) "length" else "num" + putInt(name, numArgv[i]) + i++ } - val name = if (i == 0) "length" else "num" - editor.putInt(name, numArgv[i]) - i++ } - editor.apply() return true } @@ -84,7 +83,7 @@ object PasswordGenerator { * @return list of generated passwords */ @JvmStatic - @Throws(PasswordGenerator.PasswordGeneratorExeption::class) + @Throws(PasswordGeneratorExeption::class) fun generate(ctx: Context): ArrayList<String> { val prefs = ctx.getSharedPreferences("PasswordGenerator", Context.MODE_PRIVATE) |
