kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply some smaller changes

Browse Source
This commit is contained in:
Niko Diamadis
2024-06-02 22:16:33 +02:00
parent d74bca714c
commit 5b7aff0c23
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/github/gotify/GotifyApplication.kt
View File

@@ -45,7 +45,6 @@ class GotifyApplication : Application() {
Logger.info("Migration of legacy CA cert succeeded") Logger.info("Migration of legacy CA cert succeeded")
} catch (e: IOException) { } catch (e: IOException) {
Logger.error(e, "Migration of legacy CA cert failed") Logger.error(e, "Migration of legacy CA cert failed")
if (legacyCert != null) settings.legacyCert = legacyCert
} }
} }
super.onCreate() super.onCreate()

3
app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt
View File

@@ -14,7 +14,6 @@ internal class AdvancedDialog(
private val context: Context, private val context: Context,
private val layoutInflater: LayoutInflater private val layoutInflater: LayoutInflater
) { ) {
private lateinit var dialog: AlertDialog
private lateinit var dialogDoneButton: Button private lateinit var dialogDoneButton: Button
private lateinit var binding: AdvancedSettingsDialogBinding private lateinit var binding: AdvancedSettingsDialogBinding
private var onCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null private var onCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null
@@ -82,7 +81,7 @@ internal class AdvancedDialog(
binding.clientCertPasswordEdittext.doOnTextChanged { _, _, _, _ -> binding.clientCertPasswordEdittext.doOnTextChanged { _, _, _, _ ->
showPasswordMissing(binding.clientCertPasswordEdittext.text.toString().isEmpty()) showPasswordMissing(binding.clientCertPasswordEdittext.text.toString().isEmpty())
} }
dialog = MaterialAlertDialogBuilder(context) val dialog = MaterialAlertDialogBuilder(context)
.setView(binding.root) .setView(binding.root)
.setTitle(R.string.advanced_settings) .setTitle(R.string.advanced_settings)
.setPositiveButton(context.getString(R.string.done), null) .setPositiveButton(context.getString(R.string.done), null)

4
app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
View File

@@ -65,7 +65,7 @@ internal class LoginActivity : AppCompatActivity() {
copyStreamToFile(fileStream, destinationFile) copyStreamToFile(fileStream, destinationFile)
// temporarily store it (don't store to settings until they decide to login) // temporarily store it (don't store to settings until they decide to login)
caCertCN = getNameOfCertContent(destinationFile)!! caCertCN = getNameOfCertContent(destinationFile) ?: "unknown"
caCertPath = destinationFile.absolutePath caCertPath = destinationFile.absolutePath
advancedDialog.showRemoveCaCertificate(caCertCN!!) advancedDialog.showRemoveCaCertificate(caCertCN!!)
} catch (e: Exception) { } catch (e: Exception) {
@@ -220,7 +220,7 @@ internal class LoginActivity : AppCompatActivity() {
} }
private fun getNameOfCertContent(file: File): String? { private fun getNameOfCertContent(file: File): String? {
val ca = CertUtils.parseCertificate(FileInputStream(file)) val ca = FileInputStream(file).use { CertUtils.parseCertificate(it) }
return (ca as X509Certificate).subjectX500Principal.name return (ca as X509Certificate).subjectX500Principal.name
} }