mirror
/
Buran
mirror of https://github.com/Corewala/Buran
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed broken PREF_KEY_CLIENT_CERT_ACTIVE value

This commit is contained in:
Corewala 2022-05-17 20:02:39 -04:00
parent b954e94d3b
commit 5210d8484e
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/corewala/buran/Buran.kt
View File

@ -10,7 +10,6 @@ class Buran: Application() {
const val PREF_KEY_CLIENT_CERT_URI = "client_cert_uri" const val PREF_KEY_CLIENT_CERT_URI = "client_cert_uri"
const val PREF_KEY_CLIENT_CERT_HUMAN_READABLE = "client_cert_uri_human_readable" const val PREF_KEY_CLIENT_CERT_HUMAN_READABLE = "client_cert_uri_human_readable"
const val PREF_KEY_CLIENT_CERT_ACTIVE = "client_cert_active"
const val PREF_KEY_CLIENT_CERT_PASSWORD = "client_cert_password" const val PREF_KEY_CLIENT_CERT_PASSWORD = "client_cert_password"
const val CLIENT_CERT_PASSWORD_SECRET_KEY_NAME = "client_cert_secret_key_name" const val CLIENT_CERT_PASSWORD_SECRET_KEY_NAME = "client_cert_secret_key_name"
const val PREF_KEY_USE_CUSTOM_TAB = "use_custom_tabs" const val PREF_KEY_USE_CUSTOM_TAB = "use_custom_tabs"

10
app/src/main/java/corewala/buran/io/gemini/GeminiDatasource.kt
View File

@ -2,10 +2,8 @@ package corewala.buran.io.gemini
import android.content.Context import android.content.Context
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.preference.PreferenceManager
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import corewala.buran.Buran
import corewala.buran.OppenURI import corewala.buran.OppenURI
import corewala.buran.io.GemState import corewala.buran.io.GemState
import corewala.buran.io.database.history.BuranHistory import corewala.buran.io.database.history.BuranHistory
@ -21,7 +19,6 @@ import javax.net.ssl.*
class GeminiDatasource(private val context: Context, val history: BuranHistory): Datasource { class GeminiDatasource(private val context: Context, val history: BuranHistory): Datasource {
private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
private val runtimeHistory = mutableListOf<URI>() private val runtimeHistory = mutableListOf<URI>()
private var forceDownload = false private var forceDownload = false
@ -59,13 +56,10 @@ class GeminiDatasource(private val context: Context, val history: BuranHistory):
private fun geminiRequest(uri: URI, onUpdate: (state: GemState) -> Unit, clientCertPassword: String?){ private fun geminiRequest(uri: URI, onUpdate: (state: GemState) -> Unit, clientCertPassword: String?){
val protocol = "TLS" val protocol = "TLS"
val useClientCert = prefs.getBoolean(Buran.PREF_KEY_CLIENT_CERT_ACTIVE, false)
//Update factory if operating mode has changed //Update factory if operating mode has changed
when { when (socketFactory) {
socketFactory == null -> initSSLFactory(protocol!!, clientCertPassword) null -> initSSLFactory(protocol!!, clientCertPassword)
useClientCert && !buranKeyManager.lastCallUsedKey -> initSSLFactory(protocol!!, clientCertPassword)
!useClientCert && buranKeyManager.lastCallUsedKey -> initSSLFactory(protocol!!, clientCertPassword)
} }
val socket: SSLSocket? val socket: SSLSocket?

10
app/src/main/java/corewala/buran/ui/GemActivity.kt
View File

@ -337,10 +337,10 @@ class GemActivity : AppCompatActivity() {
} }
when { when {
prefs.getBoolean( !prefs.getString(
Buran.PREF_KEY_CLIENT_CERT_ACTIVE, Buran.PREF_KEY_CLIENT_CERT_URI,
false null
) -> { ).isNullOrEmpty() -> {
binding.addressEdit.setCompoundDrawablesWithIntrinsicBounds( binding.addressEdit.setCompoundDrawablesWithIntrinsicBounds(
R.drawable.vector_client_cert, R.drawable.vector_client_cert,
0, 0,
@ -414,7 +414,7 @@ class GemActivity : AppCompatActivity() {
.setTitle(getString(R.string.client_certificate_required)) .setTitle(getString(R.string.client_certificate_required))
.setMessage(state.header.meta) .setMessage(state.header.meta)
if(prefs.getBoolean(Buran.PREF_KEY_CLIENT_CERT_ACTIVE, false)){ if(!prefs.getString(Buran.PREF_KEY_CLIENT_CERT_URI, null).isNullOrEmpty()){
builder builder
.setPositiveButton(getString(R.string.use_client_certificate).toUpperCase()) { _, _ -> .setPositiveButton(getString(R.string.use_client_certificate).toUpperCase()) { _, _ ->
if(prefs.getBoolean("use_biometrics", false) and !decryptedCertPassword.isNullOrEmpty()){ if(prefs.getBoolean("use_biometrics", false) and !decryptedCertPassword.isNullOrEmpty()){