Tweaking API usage switch handling

Ixam97 · Jul 18, 2024 · 6ad0a99 · 6ad0a99
1 parent 3baeb4f
commit 6ad0a99
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/LiveDataApi.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/LiveDataApi.kt
@@ -90,7 +90,7 @@ abstract class LiveDataApi(
      */
     protected abstract suspend fun sendNow(realTimeData: RealTimeData)
 
-    private fun updateWatchdog() {
+    protected fun updateWatchdog() {
         val currentApiStateMap = CarStatsViewer.watchdog.getCurrentWatchdogState().apiState.toMutableMap()
         currentApiStateMap[apiIdentifier] = connectionStatus.status
         CarStatsViewer.watchdog.updateWatchdogState(CarStatsViewer.watchdog.getCurrentWatchdogState().copy(

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/abrpLiveData/AbrpLiveData.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/abrpLiveData/AbrpLiveData.kt
@@ -145,6 +145,8 @@ class AbrpLiveData (
 
             abrp_use_api.setSwitchClickListener() {
                 AppPreferences(context).abrpUseApi = abrp_use_api.isChecked
+                if(!abrp_use_api.isChecked) connectionStatus = ConnectionStatus.UNUSED
+                updateWatchdog()
             }
 
             abrp_use_location.setSwitchClickListener() {

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/http/HttpLiveData.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/http/HttpLiveData.kt
@@ -135,6 +135,8 @@ class HttpLiveData (
 
         httpLiveDataEnabled.setSwitchClickListener {
             AppPreferences(context).httpLiveDataEnabled = httpLiveDataEnabled.isChecked
+            if (!httpLiveDataEnabled.isChecked) connectionStatus = ConnectionStatus.UNUSED
+            updateWatchdog()
         }
         httpLiveDataLocation.setSwitchClickListener {
             AppPreferences(context).httpLiveDataLocation = httpLiveDataLocation.isChecked

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/ui/activities/HistoryActivity.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/ui/activities/HistoryActivity.kt
@@ -3,6 +3,7 @@ package com.ixam97.carStatsViewer.ui.activities
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
+import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -122,6 +123,14 @@ class HistoryActivity  : FragmentActivity() {
                 createMultiDeleteDialog()
             }
 
+            if (CarStatsViewer.liveDataApis[1].connectionStatus == ConnectionStatus.UNUSED) {
+                historyButtonUpload.isEnabled = false
+                historyButtonUpload.setColorFilter(
+                    getColor(R.color.disabled_tint),
+                    PorterDuff.Mode.SRC_IN
+                )
+            }
+
             historyButtonUpload.setOnClickListener {
                 openUploadDialog()
             }