From c322b559646f3efb86178ecbadfd1d516289a1e3 Mon Sep 17 00:00:00 2001 From: Max Grakov Date: Sat, 23 Nov 2024 14:36:54 +0100 Subject: [PATCH] version (#67) Build version is not required on the ABS Server --- app/build.gradle.kts | 4 ++-- .../common/converter/ConnectionInfoResponseConverter.kt | 4 ++-- .../common/model/connection/ConnectionInfoResponse.kt | 6 +++--- .../org/grakovne/lissen/channel/common/ConnectionInfo.kt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9b12ad4c..a7e2f584 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -25,8 +25,8 @@ android { applicationId = "org.grakovne.lissen" minSdk = 28 targetSdk = 35 - versionCode = 42 - versionName = "1.1.11" + versionCode = 43 + versionName = "1.1.12" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/converter/ConnectionInfoResponseConverter.kt b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/converter/ConnectionInfoResponseConverter.kt index f6903401..0baa740c 100644 --- a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/converter/ConnectionInfoResponseConverter.kt +++ b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/converter/ConnectionInfoResponseConverter.kt @@ -10,7 +10,7 @@ class ConnectionInfoResponseConverter @Inject constructor() { fun apply(response: ConnectionInfoResponse): ConnectionInfo = ConnectionInfo( username = response.user.username, - serverVersion = response.serverSettings.version, - buildNumber = response.serverSettings.buildNumber, + serverVersion = response.serverSettings?.version, + buildNumber = response.serverSettings?.buildNumber, ) } diff --git a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/model/connection/ConnectionInfoResponse.kt b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/model/connection/ConnectionInfoResponse.kt index d09f0c5e..228c54a9 100644 --- a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/model/connection/ConnectionInfoResponse.kt +++ b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/model/connection/ConnectionInfoResponse.kt @@ -2,7 +2,7 @@ package org.grakovne.lissen.channel.audiobookshelf.common.model.connection data class ConnectionInfoResponse( val user: ConnectionInfoUserResponse, - val serverSettings: ConnectionInfoServerResponse, + val serverSettings: ConnectionInfoServerResponse?, ) data class ConnectionInfoUserResponse( @@ -10,6 +10,6 @@ data class ConnectionInfoUserResponse( ) data class ConnectionInfoServerResponse( - val version: String, - val buildNumber: String, + val version: String?, + val buildNumber: String?, ) diff --git a/app/src/main/java/org/grakovne/lissen/channel/common/ConnectionInfo.kt b/app/src/main/java/org/grakovne/lissen/channel/common/ConnectionInfo.kt index 0f9c2954..fd9e2986 100644 --- a/app/src/main/java/org/grakovne/lissen/channel/common/ConnectionInfo.kt +++ b/app/src/main/java/org/grakovne/lissen/channel/common/ConnectionInfo.kt @@ -2,6 +2,6 @@ package org.grakovne.lissen.channel.common data class ConnectionInfo( val username: String, - val serverVersion: String, - val buildNumber: String, + val serverVersion: String?, + val buildNumber: String?, )