From 0981c23e37c3537461935e6c19e09c97fecad9d9 Mon Sep 17 00:00:00 2001 From: Corewala Date: Tue, 3 May 2022 21:24:01 -0400 Subject: [PATCH] Check for certificate before offering continue button --- .../java/corewala/buran/ui/GemActivity.kt | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/corewala/buran/ui/GemActivity.kt b/app/src/main/java/corewala/buran/ui/GemActivity.kt index dc54509..e9a54e4 100644 --- a/app/src/main/java/corewala/buran/ui/GemActivity.kt +++ b/app/src/main/java/corewala/buran/ui/GemActivity.kt @@ -402,14 +402,23 @@ class GemActivity : AppCompatActivity() { is GemState.ClientCertRequired -> runOnUiThread { loadingView(false) - AlertDialog.Builder(this, R.style.AppDialogTheme) + val builder = AlertDialog.Builder(this, R.style.AppDialogTheme) + builder .setTitle(getString(R.string.client_certificate_required)) .setMessage(state.header.meta) - .setPositiveButton(getString(R.string.use_client_certificate)) { _, _ -> - model.request(state.uri.toString(), true) - } - .setNegativeButton(getString(R.string.cancel)) { _, _ -> } - .show() + + if(prefs.getString(Buran.PREF_KEY_CLIENT_CERT_HUMAN_READABLE, null) != null){ + builder + .setPositiveButton(getString(R.string.use_client_certificate)) { _, _ -> + model.request(state.uri.toString(), true) + } + .setNegativeButton(getString(R.string.cancel)) { _, _ -> } + .show() + }else{ + builder + .setNegativeButton(getString(R.string.close)) { _, _ -> } + .show() + } } is GemState.Requesting -> loadingView(true)