aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/autofill
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2020-04-21 13:11:27 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2020-04-21 15:55:25 +0530
commitd505151662da1c9a9d9ce5434db2a370d4167e36 (patch)
treee0a3fdafc56c07dba5980ae92b1a76477992f97b /app/src/main/java/com/zeapo/pwdstore/autofill
parente1921b26e0fdc9d4fdb9df2f31278aba051edf0f (diff)
downloadHardenedPass-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/autofill')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.kt21
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.kt47
2 files changed, 34 insertions, 34 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.kt
index c3186db5..bd22f4a4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.kt
@@ -11,10 +11,9 @@ import android.content.IntentSender
import android.content.SharedPreferences
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.edit
import com.zeapo.pwdstore.PasswordStore
import com.zeapo.pwdstore.utils.splitLines
-import java.util.ArrayList
-import java.util.Arrays
import org.eclipse.jgit.util.StringUtils
import timber.log.Timber
@@ -71,17 +70,17 @@ class AutofillActivity : AppCompatActivity() {
} else {
applicationContext.getSharedPreferences("autofill_web", Context.MODE_PRIVATE)
}
- val editor = prefs.edit()
- when (val preference = prefs.getString(packageName, "")) {
- "", "/first", "/never" -> editor.putString(packageName, path)
- else -> {
- val matches = ArrayList(Arrays.asList(*preference!!.trim { it <= ' ' }.splitLines()))
- matches.add(path)
- val paths = StringUtils.join(matches, "\n")
- editor.putString(packageName, paths)
+ prefs.edit {
+ when (val preference = prefs.getString(packageName, "")) {
+ "", "/first", "/never" -> putString(packageName, path)
+ else -> {
+ val matches = arrayListOf(*preference!!.trim { it <= ' ' }.splitLines())
+ matches.add(path)
+ val paths = StringUtils.join(matches, "\n")
+ putString(packageName, paths)
+ }
}
}
- editor.apply()
}
}
super.onActivityResult(requestCode, resultCode, data)
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.kt
index a2d82097..1f69413c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.kt
@@ -23,6 +23,7 @@ import android.widget.RadioGroup
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.edit
import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.zeapo.pwdstore.PasswordStore
@@ -118,14 +119,14 @@ class AutofillFragment : DialogFragment() {
// write to preferences when OK clicked
builder.setPositiveButton(R.string.dialog_ok) { _, _ -> }
builder.setNegativeButton(R.string.dialog_cancel, null)
- val editor = prefs.edit()
if (isWeb) {
builder.setNeutralButton(R.string.autofill_apps_delete) { _, _ ->
if (callingActivity.recyclerAdapter != null &&
packageName != null && packageName != "") {
- editor.remove(packageName)
- callingActivity.recyclerAdapter?.removeWebsite(packageName)
- editor.apply()
+ prefs.edit {
+ remove(packageName)
+ callingActivity.recyclerAdapter?.removeWebsite(packageName)
+ }
}
}
}
@@ -148,7 +149,6 @@ class AutofillFragment : DialogFragment() {
} else {
callingActivity.applicationContext.getSharedPreferences("autofill_web", Context.MODE_PRIVATE)
}
- val editor = prefs.edit()
var packageName = args.getString("packageName", "")
if (isWeb) {
@@ -169,27 +169,28 @@ class AutofillFragment : DialogFragment() {
}
// write to preferences accordingly
- val radioGroup = dialog.findViewById<RadioGroup>(R.id.autofill_radiogroup)
- when (radioGroup.checkedRadioButtonId) {
- R.id.use_default -> if (!isWeb) {
- editor.remove(packageName)
- } else {
- editor.putString(packageName, "")
- }
- R.id.first -> editor.putString(packageName, "/first")
- R.id.never -> editor.putString(packageName, "/never")
- else -> {
- val paths = StringBuilder()
- for (i in 0 until adapter!!.count) {
- paths.append(adapter!!.getItem(i))
- if (i != adapter!!.count) {
- paths.append("\n")
+ prefs.edit {
+ val radioGroup = dialog.findViewById<RadioGroup>(R.id.autofill_radiogroup)
+ when (radioGroup.checkedRadioButtonId) {
+ R.id.use_default -> if (!isWeb) {
+ remove(packageName)
+ } else {
+ putString(packageName, "")
+ }
+ R.id.first -> putString(packageName, "/first")
+ R.id.never -> putString(packageName, "/never")
+ else -> {
+ val paths = StringBuilder()
+ for (i in 0 until adapter!!.count) {
+ paths.append(adapter!!.getItem(i))
+ if (i != adapter!!.count) {
+ paths.append("\n")
+ }
}
+ putString(packageName, paths.toString())
}
- editor.putString(packageName, paths.toString())
}
}
- editor.apply()
// notify the recycler adapter if it is loaded
callingActivity.recyclerAdapter?.apply {
@@ -204,7 +205,7 @@ class AutofillFragment : DialogFragment() {
packageName -> notifyItemChanged(position)
"" -> addWebsite(packageName)
else -> {
- editor.remove(oldPackageName)
+ prefs.edit { remove(oldPackageName) }
updateWebsite(oldPackageName, packageName)
}
}