From 82a9a6125473dbffa6a76f33c6ff83b4a1bd69b3 Mon Sep 17 00:00:00 2001 From: Aditya Wasan Date: Wed, 1 Jul 2020 00:00:02 +0530 Subject: Use PreferenceKeys file to manage SharedPreferences keys. (#891) * Use PreferenceKeys file to manage SharedPreferences keys. Signed-off-by: Aditya Wasan * Use PreferenceKeys in all files Signed-off-by: Aditya Wasan * Divide PreferenceKeys into multiple regions Signed-off-by: Aditya Wasan * Fix build error Signed-off-by: Aditya Wasan * Use PreferenceKeys in more files Signed-off-by: Aditya Wasan * Reformat code Signed-off-by: Aditya Wasan * Fix build error Signed-off-by: Aditya Wasan * Fix merge issues Signed-off-by: Aditya Wasan --- app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt index fcadf119..88ba20f1 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt @@ -27,6 +27,7 @@ import com.google.android.material.snackbar.Snackbar import com.zeapo.pwdstore.ClipboardService import com.zeapo.pwdstore.R import com.zeapo.pwdstore.UserPreference +import com.zeapo.pwdstore.utils.PreferenceKeys import com.zeapo.pwdstore.utils.clipboard import com.zeapo.pwdstore.utils.snackbar import me.msfjarvis.openpgpktx.util.OpenPgpApi @@ -94,7 +95,7 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE) tag(TAG) - keyIDs = settings.getStringSet("openpgp_key_ids_set", null) ?: emptySet() + keyIDs = settings.getStringSet(PreferenceKeys.OPENPGP_KEY_IDS_SET, null) ?: emptySet() } /** @@ -133,7 +134,7 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou * [startActivityForResult]. */ fun bindToOpenKeychain(onBoundListener: OpenPgpServiceConnection.OnBound, activityResult: ActivityResultLauncher) { - val providerPackageName = settings.getString("openpgp_provider_list", "") + val providerPackageName = settings.getString(PreferenceKeys.OPENPGP_PROVIDER_LIST, "") if (providerPackageName.isNullOrEmpty()) { Toast.makeText(this, resources.getString(R.string.provider_toast_text), Toast.LENGTH_LONG).show() activityResult.launch(Intent(this, UserPreference::class.java)) @@ -215,7 +216,8 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou var clearAfter = 45 try { - clearAfter = (settings.getString("general_show_time", "45") ?: "45").toInt() + clearAfter = (settings.getString(PreferenceKeys.GENERAL_SHOW_TIME, "45") + ?: "45").toInt() } catch (_: NumberFormatException) { } -- cgit v1.2.3