From 98927998244c3cce103f92f6e1a85050e8d0c5ba Mon Sep 17 00:00:00 2001 From: Aditya Wasan Date: Wed, 13 Nov 2019 12:31:02 +0530 Subject: Prevent an activity loop when no OpenPGP Provider is selected (#572) Signed-off-by: Aditya Wasan --- app/src/main/java/com/zeapo/pwdstore/UserPreference.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt index d2b08132..d40c0802 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt @@ -29,6 +29,7 @@ import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager import androidx.preference.SwitchPreferenceCompat import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.snackbar.Snackbar import com.zeapo.pwdstore.autofill.AutofillPreferenceActivity import com.zeapo.pwdstore.crypto.PgpActivity import com.zeapo.pwdstore.git.GitActivity @@ -126,10 +127,16 @@ class UserPreference : AppCompatActivity() { appVersionPreference?.summary = "Version: ${BuildConfig.VERSION_NAME}" keyPreference?.onPreferenceClickListener = ClickListener { - val intent = Intent(callingActivity, PgpActivity::class.java) - intent.putExtra("OPERATION", "GET_KEY_ID") - startActivityForResult(intent, IMPORT_PGP_KEY) - true + val providerPackageName = requireNotNull(sharedPreferences.getString("openpgp_provider_list", "")) + if (providerPackageName.isEmpty()) { + Snackbar.make(requireView(), resources.getString(R.string.provider_toast_text), Snackbar.LENGTH_LONG).show() + false + } else { + val intent = Intent(callingActivity, PgpActivity::class.java) + intent.putExtra("OPERATION", "GET_KEY_ID") + startActivityForResult(intent, IMPORT_PGP_KEY) + true + } } sshKeyPreference?.onPreferenceClickListener = ClickListener { -- cgit v1.2.3