starred/audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2026-07-28 23:48:45 +02:00
Code Issues 454 Packages Projects Releases 10 Wiki Activity

Add deviceId to DeviceInfo for Android

Browse Source
This commit is contained in:
advplyr
2023-04-22 16:48:22 -05:00
parent e842de78dd
commit d9a6ec65df
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt
+1
View File
@@ -74,6 +74,7 @@ open class LibraryItemWrapper(var id:String) {
@JsonIgnoreProperties(ignoreUnknown = true)
data class DeviceInfo(
var deviceId:String,
var manufacturer:String,
var model:String,
var brand:String,
android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt
+5 -2
View File
@@ -1,5 +1,6 @@
package com.audiobookshelf.app.player
import android.annotation.SuppressLint
import android.app.*
import android.appwidget.AppWidgetManager
import android.content.ComponentName
@@ -16,6 +17,7 @@ import android.net.NetworkCapabilities
import android.net.NetworkRequest
import android.os.*
import android.provider.MediaStore
import android.provider.Settings
import android.support.v4.media.MediaBrowserCompat
import android.support.v4.media.MediaDescriptionCompat
import android.support.v4.media.MediaMetadataCompat
@@ -31,7 +33,6 @@ import androidx.core.content.ContextCompat
import androidx.media.MediaBrowserServiceCompat
import androidx.media.utils.MediaConstants
import com.audiobookshelf.app.BuildConfig
import com.audiobookshelf.app.MediaPlayerWidget
import com.audiobookshelf.app.R
import com.audiobookshelf.app.data.*
import com.audiobookshelf.app.data.DeviceInfo
@@ -894,6 +895,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat() {
return if(currentPlayer == castPlayer) PLAYER_CAST else PLAYER_EXO
}
@SuppressLint("HardwareIds")
private fun getDeviceInfo(): DeviceInfo {
/* EXAMPLE
manufacturer: Google
@@ -902,7 +904,8 @@ class PlayerNotificationService : MediaBrowserServiceCompat() {
sdkVersion: 32
appVersion: 0.9.46-beta
*/
return DeviceInfo(Build.MANUFACTURER, Build.MODEL, Build.BRAND, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME)
val deviceId = Settings.Secure.getString(ctx.contentResolver, Settings.Secure.ANDROID_ID)
return DeviceInfo(deviceId, Build.MANUFACTURER, Build.MODEL, Build.BRAND, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME)
}
private val deviceSettings get() = DeviceManager.deviceData.deviceSettings ?: DeviceSettings.default()