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

Move cert migration to GotifyApplication and synchronize calls

Browse Source
This commit is contained in:
Niko Diamadis
2024-06-02 20:42:54 +02:00
parent 11448f7d2c
commit d74bca714c
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,13 @@ import android.app.Application
import android.app.NotificationManager import android.app.NotificationManager
import android.os.Build import android.os.Build
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.github.gotify.api.CertUtils
import com.github.gotify.log.LoggerHelper import com.github.gotify.log.LoggerHelper
import com.github.gotify.log.UncaughtExceptionHandler import com.github.gotify.log.UncaughtExceptionHandler
import com.github.gotify.settings.ThemeHelper import com.github.gotify.settings.ThemeHelper
import java.io.File
import java.io.FileOutputStream
import java.io.IOException
import org.tinylog.kotlin.Logger import org.tinylog.kotlin.Logger
class GotifyApplication : Application() { class GotifyApplication : Application() {
@@ -26,6 +30,24 @@ class GotifyApplication : Application() {
) )
} }
val settings = Settings(this)
if (settings.legacyCert != null) {
Logger.info("Migrating legacy CA cert to new location")
var legacyCert: String? = null
try {
legacyCert = settings.legacyCert
settings.legacyCert = null
val caCertFile = File(settings.filesDir, CertUtils.CA_CERT_NAME)
FileOutputStream(caCertFile).use {
it.write(legacyCert?.encodeToByteArray())
}
settings.caCertPath = caCertFile.absolutePath
Logger.info("Migration of legacy CA cert succeeded")
} catch (e: IOException) {
Logger.error(e, "Migration of legacy CA cert failed")
if (legacyCert != null) settings.legacyCert = legacyCert
}
}
super.onCreate() super.onCreate()
} }
} }

7
app/src/main/kotlin/com/github/gotify/Settings.kt
View File

@@ -29,10 +29,10 @@ internal class Settings(context: Context) {
set(value) = sharedPreferences.edit().putString("version", value).apply() set(value) = sharedPreferences.edit().putString("version", value).apply()
var legacyCert: String? var legacyCert: String?
get() = sharedPreferences.getString("cert", null) get() = sharedPreferences.getString("cert", null)
set(value) = sharedPreferences.edit().putString("cert", value).apply() set(value) = sharedPreferences.edit().putString("cert", value).commit().toUnit()
var caCertPath: String? var caCertPath: String?
get() = sharedPreferences.getString("caCertPath", null) get() = sharedPreferences.getString("caCertPath", null)
set(value) = sharedPreferences.edit().putString("caCertPath", value).apply() set(value) = sharedPreferences.edit().putString("caCertPath", value).commit().toUnit()
var caCertCN: String? var caCertCN: String?
get() = sharedPreferences.getString("caCertCN", null) get() = sharedPreferences.getString("caCertCN", null)
set(value) = sharedPreferences.edit().putString("caCertCN", value).apply() set(value) = sharedPreferences.edit().putString("caCertCN", value).apply()
@@ -76,4 +76,7 @@ internal class Settings(context: Context) {
clientCertPassword clientCertPassword
) )
} }
@Suppress("UnusedReceiverParameter")
private fun Any?.toUnit() = Unit
} }

21
app/src/main/kotlin/com/github/gotify/api/ClientFactory.kt
View File

@@ -7,10 +7,6 @@ import com.github.gotify.client.api.UserApi
import com.github.gotify.client.api.VersionApi import com.github.gotify.client.api.VersionApi
import com.github.gotify.client.auth.ApiKeyAuth import com.github.gotify.client.auth.ApiKeyAuth
import com.github.gotify.client.auth.HttpBasicAuth import com.github.gotify.client.auth.HttpBasicAuth
import java.io.File
import java.io.FileOutputStream
import java.io.IOException
import org.tinylog.kotlin.Logger
internal object ClientFactory { internal object ClientFactory {
private fun unauthorized( private fun unauthorized(
@@ -60,23 +56,6 @@ internal object ClientFactory {
baseUrl: String = settings.url baseUrl: String = settings.url
): ApiClient { ): ApiClient {
val client = ApiClient(authentications) val client = ApiClient(authentications)
if (settings.legacyCert != null) {
Logger.info("Migrating legacy CA cert to new location")
var legacyCert: String? = null
try {
legacyCert = settings.legacyCert
settings.legacyCert = null
val caCertFile = File(settings.filesDir, CertUtils.CA_CERT_NAME)
FileOutputStream(caCertFile).use {
it.write(legacyCert?.encodeToByteArray())
}
settings.caCertPath = caCertFile.absolutePath
Logger.info("Migration of legacy CA cert succeeded")
} catch (e: IOException) {
Logger.error(e, "Migration of legacy CA cert failed")
if (legacyCert != null) settings.legacyCert = legacyCert
}
}
CertUtils.applySslSettings(client.okBuilder, sslSettings) CertUtils.applySslSettings(client.okBuilder, sslSettings)
client.adapterBuilder.baseUrl("$baseUrl/") client.adapterBuilder.baseUrl("$baseUrl/")
return client return client