Shorten driver Reverb heartbeat

app/build.gradle.kts

@@ -33,8 +33,8 @@ android {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
         targetSdk = 35
-        versionCode = 33
+        versionCode = 35
-        versionName = "1.0.32"
+        versionName = "1.0.34"
         setProperty("archivesBaseName", "pl.firmatpp.kierowca")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/pl/firmatpp/kierowca/data/model/DriverModels.kt

@@ -47,6 +47,7 @@ data class BootstrapResponse(
     val routes: RoutesBucketDto,
     val driverAppSettings: DriverAppSettingsDto?,
     val notificationPreferences: NotificationPreferencesDto? = null,
+    val realtime: RealtimeConfigDto? = null,
     val syncState: SyncStateResponse? = null,
 )
 
@@ -71,6 +72,12 @@ data class NotificationPreferencesDto(
     val notifyNewRoutes: Boolean = false,
 )
 
+data class RealtimeConfigDto(
+    val reverbEnabled: Boolean = false,
+    val reverbAppKey: String? = null,
+    val reverbWsBaseUrl: String? = null,
+)
+
 data class RoutesBucketDto(
     val today: List<DriverRouteDto> = emptyList(),
 )

app/src/main/java/pl/firmatpp/kierowca/sync/DriverLiveSyncClient.kt

@@ -15,8 +15,8 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
-import pl.firmatpp.kierowca.BuildConfig
 import pl.firmatpp.kierowca.data.DriverRepository
+import pl.firmatpp.kierowca.data.model.RealtimeConfigDto
 
 class DriverLiveSyncClient(
     private val repository: DriverRepository,
@@ -25,20 +25,29 @@ class DriverLiveSyncClient(
     private val client: OkHttpClient = OkHttpClient(),
     private val gson: Gson = Gson(),
 ) {
+    private companion object {
+        const val HEARTBEAT_INTERVAL_MS = 10_000L
+    }
+
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
     private val started = AtomicBoolean(false)
     private var webSocket: WebSocket? = null
     private var driverId: String? = null
+    private var realtimeConfig: RealtimeConfigDto? = null
     private var socketId: String? = null
     private var heartbeatJob: Job? = null
 
-    fun start(driverId: String) {
+    fun start(driverId: String, config: RealtimeConfigDto?) {
-        if (BuildConfig.REVERB_APP_KEY.isBlank()) return
+        val appKey = config?.reverbAppKey?.takeIf { it.isNotBlank() } ?: return
+        val wsBaseUrl = config.reverbWsBaseUrl?.takeIf { it.isNotBlank() } ?: return
+        if (!config.reverbEnabled) return
+
+        realtimeConfig = config
         this.driverId = driverId
         if (!started.compareAndSet(false, true)) return
 
-        val wsUrl = BuildConfig.REVERB_WS_BASE_URL.trimEnd('/') +
+        val wsUrl = wsBaseUrl.trimEnd('/') +
-            "/" + BuildConfig.REVERB_APP_KEY +
+            "/" + appKey +
             "?protocol=7&client=android&version=1.0&flash=false"
 
         webSocket = client.newWebSocket(
@@ -72,6 +81,7 @@ class DriverLiveSyncClient(
         webSocket?.close(1000, "logout")
         webSocket = null
         driverId = null
+        realtimeConfig = null
         socketId = null
     }
 
@@ -146,7 +156,7 @@ class DriverLiveSyncClient(
         scope.launch {
             delay(5_000)
             if (!started.get() && driverId == id) {
-                start(id)
+                start(id, realtimeConfig)
             }
         }
     }
@@ -156,7 +166,7 @@ class DriverLiveSyncClient(
         heartbeatJob = scope.launch {
             while (started.get()) {
                 reportRealtimeStatus("connected")
-                delay(30_000)
+                delay(HEARTBEAT_INTERVAL_MS)
             }
         }
     }

app/src/main/java/pl/firmatpp/kierowca/ui/DriverViewModel.kt

@@ -168,7 +168,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     )
                 }
                 response.session.driver.id.let { driverId ->
-                    liveSyncClient.start(driverId)
+                    liveSyncClient.start(driverId, response.realtime)
                     registerPushTokenIfAvailable(driverId)
                 }
             }.onFailure { throwable ->