diff options
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/autofill')
3 files changed, 8 insertions, 11 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillHelper.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillHelper.kt index d5c7af75..14bcb501 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillHelper.kt +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillHelper.kt @@ -23,6 +23,8 @@ import com.zeapo.pwdstore.R import com.zeapo.pwdstore.model.PasswordEntry import com.zeapo.pwdstore.utils.PasswordRepository import com.zeapo.pwdstore.utils.PreferenceKeys +import com.zeapo.pwdstore.utils.getString +import com.zeapo.pwdstore.utils.sharedPrefs import java.io.File import java.security.MessageDigest @@ -37,11 +39,7 @@ private fun ByteArray.base64(): String { return Base64.encodeToString(this, Base64.NO_WRAP) } -private fun Context.getDefaultUsername(): String? { - return PreferenceManager - .getDefaultSharedPreferences(this) - .getString(PreferenceKeys.OREO_AUTOFILL_DEFAULT_USERNAME, null) -} +private fun Context.getDefaultUsername() = sharedPrefs.getString(PreferenceKeys.OREO_AUTOFILL_DEFAULT_USERNAME) private fun stableHash(array: Collection<ByteArray>): String { val hashes = array.map { it.sha256().base64() } diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillPreferences.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillPreferences.kt index 3e10933a..9c84e1ad 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillPreferences.kt +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillPreferences.kt @@ -5,10 +5,8 @@ package com.zeapo.pwdstore.autofill.oreo import android.content.Context -import android.content.SharedPreferences import android.os.Build import androidx.annotation.RequiresApi -import androidx.preference.PreferenceManager import com.zeapo.pwdstore.utils.sharedPrefs import java.io.File import java.nio.file.Paths diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/PublicSuffixListCache.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/PublicSuffixListCache.kt index 536357f5..8107248e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/PublicSuffixListCache.kt +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/PublicSuffixListCache.kt @@ -6,8 +6,8 @@ package com.zeapo.pwdstore.autofill.oreo import android.content.Context import android.util.Patterns -import androidx.preference.PreferenceManager import com.zeapo.pwdstore.utils.PreferenceKeys +import com.zeapo.pwdstore.utils.getString import com.zeapo.pwdstore.utils.sharedPrefs import kotlinx.coroutines.runBlocking import mozilla.components.lib.publicsuffixlist.PublicSuffixList @@ -69,9 +69,10 @@ fun getSuffixPlusUpToOne(domain: String, suffix: String): String? { } fun getCustomSuffixes(context: Context): Sequence<String> { - return context.sharedPrefs.getString(PreferenceKeys.OREO_AUTOFILL_CUSTOM_PUBLIC_SUFFIXES, "")!! - .splitToSequence('\n') - .filter { it.isNotBlank() && it.first() != '.' && it.last() != '.' } + return context.sharedPrefs.getString(PreferenceKeys.OREO_AUTOFILL_CUSTOM_PUBLIC_SUFFIXES) + ?.splitToSequence('\n') + ?.filter { it.isNotBlank() && it.first() != '.' && it.last() != '.' } + ?: emptySequence() } suspend fun getCanonicalSuffix(context: Context, domain: String): String { |
