From 43ec35fe67df3a186a5f71ce96d532cbe09b34f8 Mon Sep 17 00:00:00 2001 From: advplyr Date: Fri, 5 Apr 2024 16:39:24 -0500 Subject: [PATCH] Fix:Android device info client version --- .../com/audiobookshelf/app/player/PlayerNotificationService.kt | 3 ++- .../src/main/java/com/audiobookshelf/app/server/ApiHandler.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt index 17416663..0fbf9576 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt @@ -34,6 +34,7 @@ import com.audiobookshelf.app.managers.SleepTimerManager import com.audiobookshelf.app.media.MediaManager import com.audiobookshelf.app.media.MediaProgressSyncer import com.audiobookshelf.app.server.ApiHandler +import com.audiobookshelf.app.BuildConfig import com.google.android.exoplayer2.* import com.google.android.exoplayer2.audio.AudioAttributes import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector @@ -947,7 +948,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { appVersion: 0.9.46-beta */ val deviceId = Settings.Secure.getString(ctx.contentResolver, Settings.Secure.ANDROID_ID) - return DeviceInfo(deviceId, Build.MANUFACTURER, Build.MODEL, Build.VERSION.SDK_INT, Build.VERSION.RELEASE) + return DeviceInfo(deviceId, Build.MANUFACTURER, Build.MODEL, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME) } private val deviceSettings get() = DeviceManager.deviceData.deviceSettings ?: DeviceSettings.default() diff --git a/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt b/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt index 15941ac7..ff8ed6b5 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/server/ApiHandler.kt @@ -11,6 +11,7 @@ import com.audiobookshelf.app.media.MediaEventManager import com.audiobookshelf.app.media.MediaProgressSyncData import com.audiobookshelf.app.media.SyncResult import com.audiobookshelf.app.models.User +import com.audiobookshelf.app.BuildConfig import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.core.json.JsonReadFeature import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper @@ -327,7 +328,7 @@ class ApiHandler(var ctx:Context) { fun sendSyncLocalSessions(playbackSessions:List, cb: (Boolean, String?) -> Unit) { @SuppressLint("HardwareIds") val deviceId = Settings.Secure.getString(ctx.contentResolver, Settings.Secure.ANDROID_ID) - val deviceInfo = DeviceInfo(deviceId, Build.MANUFACTURER, Build.MODEL, Build.VERSION.SDK_INT, Build.VERSION.RELEASE) + val deviceInfo = DeviceInfo(deviceId, Build.MANUFACTURER, Build.MODEL, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME) val payload = JSObject(jacksonMapper.writeValueAsString(LocalSessionsSyncRequestPayload(playbackSessions, deviceInfo))) Log.d(tag, "Sending ${playbackSessions.size} saved local playback sessions to server")