feat: add trip logs auto sync

Author: tzebrowski

app/src/main/java/org/obd/graphs/activity/Receivers.kt

@@ -54,6 +54,7 @@ import org.obd.graphs.ScreenLock
 import org.obd.graphs.TRIPS_UPLOAD_FAILED
 import org.obd.graphs.TRIPS_UPLOAD_NO_FILES_SELECTED
 import org.obd.graphs.TRIPS_UPLOAD_SUCCESSFUL
+import org.obd.graphs.TRIP_LOG_WRITE_COMPLETED
 import org.obd.graphs.bl.datalogger.DATA_LOGGER_ADAPTER_NOT_SET_EVENT
 import org.obd.graphs.bl.datalogger.DATA_LOGGER_CONNECTED_EVENT
 import org.obd.graphs.bl.datalogger.DATA_LOGGER_CONNECTING_EVENT
@@ -75,6 +76,7 @@ import org.obd.graphs.bl.extra.EVENT_VEHICLE_STATUS_VEHICLE_IDLING
 import org.obd.graphs.bl.extra.EVENT_VEHICLE_STATUS_VEHICLE_RUNNING
 import org.obd.graphs.getContext
 import org.obd.graphs.getSerializableCompat
+import org.obd.graphs.integrations.gcp.gdrive.DriveSync
 import org.obd.graphs.preferences.PREFS_CONNECTION_TYPE_CHANGED_EVENT
 import org.obd.graphs.preferences.Prefs
 import org.obd.graphs.preferences.isEnabled
@@ -101,6 +103,10 @@ private const val EVENT_VEHICLE_STATUS_CHANGED = "event.vehicle.status.CHANGED"
 
 internal fun MainActivity.receive(intent: Intent?) {
     when (intent?.action) {
+        TRIP_LOG_WRITE_COMPLETED -> {
+            DriveSync.start()
+        }
+
         DATA_LOGGER_SCHEDULED_STOP_EVENT -> {
             Log.d(
                 LOG_TAG,
@@ -388,6 +394,7 @@ internal fun MainActivity.registerReceiver() {
         it.addAction(NAVIGATION_BUTTONS_VISIBILITY_CHANGED)
         it.addAction(DATA_LOGGER_SCHEDULED_STOP_EVENT)
         it.addAction(PROFILE_NAME_CHANGED_EVENT)
+        it.addAction(TRIP_LOG_WRITE_COMPLETED)
     }
 
     registerReceiver(this, DataLoggerRepository.broadcastReceivers()) {

app/src/main/java/org/obd/graphs/preferences/trips/TripViewAdapter.kt

@@ -19,6 +19,9 @@ package org.obd.graphs.preferences.trips
 import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -37,6 +40,7 @@ import org.obd.graphs.ui.common.setText
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import androidx.core.graphics.toColorInt
 
 private const val LOGGER_KEY = "TripsViewAdapter"
 
@@ -80,7 +84,28 @@ class TripViewAdapter internal constructor(
                 startTs = dateFormat.format(Date(it))
             }
 
-            holder.tripStartDate.setText(startTs, Color.GRAY, Typeface.NORMAL, 0.9f)
+            source.startTime.toLongOrNull()?.let {
+                startTs = dateFormat.format(Date(it))
+            }
+
+            if (source.isSynced) {
+                val syncText = "  ☁️ Synced"
+                val fullText = startTs + syncText
+
+                holder.tripStartDate.setText(fullText, Color.GRAY, Typeface.NORMAL, 0.9f)
+
+                val spannable = SpannableString(fullText)
+                spannable.setSpan(
+                    ForegroundColorSpan("#4CAF50".toColorInt()), // A nice Material Green
+                    startTs.length,
+                    fullText.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+
+                holder.tripStartDate.text = spannable
+            } else {
+                holder.tripStartDate.setText(startTs, Color.GRAY, Typeface.NORMAL, 0.9f)
+            }
 
             holder.selected.isChecked = checked
             holder.selected.setOnCheckedChangeListener { buttonView, isChecked ->
@@ -90,6 +115,7 @@ class TripViewAdapter internal constructor(
             }
 
             holder.tripTime.let {
+
                 val seconds: Int = source.tripTimeSec.toInt() % 60
                 var hours: Int = source.tripTimeSec.toInt() / 60
                 val minutes = hours % 60
@@ -99,6 +125,7 @@ class TripViewAdapter internal constructor(
                 }:${seconds.toString().padStart(2, '0')}s"
 
                 it.setText(text, Color.GRAY, Typeface.BOLD, 0.9f)
+
             }
         }
     }

common/src/main/java/org/obd/graphs/Constants.kt

@@ -16,6 +16,8 @@
  */
 package org.obd.graphs
 
+const val TRIP_LOG_WRITE_COMPLETED = "trip.log.write.completed.event"
+
 const val LANGUAGE_CHANGE_EVENT = "lang.change.event"
 
 const val SCREEN_LOCK_DIALOG_CANCELLED_EVENT = "screen.lock.dialog.cancelled.event"

datalogger/src/main/java/org/obd/graphs/bl/trip/DefaultTripManager.kt

@@ -21,6 +21,7 @@ import android.util.Log
 import org.obd.graphs.SCREEN_LOCK_PROGRESS_EVENT
 import org.obd.graphs.SCREEN_UNLOCK_PROGRESS_EVENT
 import org.obd.graphs.ScreenLock
+import org.obd.graphs.TRIP_LOG_WRITE_COMPLETED
 import org.obd.graphs.bl.datalogger.DataLoggerRepository
 import org.obd.graphs.bl.datalogger.scaleToRange
 import org.obd.graphs.commons.R
@@ -188,6 +189,7 @@ internal class DefaultTripManager : TripManager {
 
                     activeTripId = null
                     ts = System.currentTimeMillis() - ts
+                    sendBroadcastEvent(TRIP_LOG_WRITE_COMPLETED)
                     Log.i(LOG_TAG, "Trip: $currentTripId is saved. It took $ts ms")
                 }
             } finally {

datalogger/src/main/java/org/obd/graphs/bl/trip/TripDescParser.kt

@@ -28,17 +28,21 @@ class TripDescParser {
         val startTime = if (p.size > 2) p[2] else ""
         val tripTimeSec = if (p.size > 3) p[3] else "0"
 
+        val isSynced = fileName.endsWith(".synced")
+
         return TripFileDesc(
             fileName = fileName,
             profileId = profileId,
             profileLabel = profileLabel,
             startTime = startTime,
-            tripTimeSec = tripTimeSec
+            tripTimeSec = tripTimeSec,
+            isSynced = isSynced
         )
     }
 
     fun decodeTripName(fileName: String): List<String> {
-        val nameWithoutExtension = fileName.substringBeforeLast(".")
+        val cleanName = fileName.removeSuffix(".synced")
+        val nameWithoutExtension = cleanName.substringBeforeLast(".")
         return nameWithoutExtension.split("-")
     }
 }

datalogger/src/main/java/org/obd/graphs/bl/trip/TripModel.kt

@@ -25,7 +25,8 @@ data class TripFileDesc(
     val profileId: String,
     val profileLabel: String,
     val startTime: String,
-    val tripTimeSec: String
+    val tripTimeSec: String,
+    val isSynced: Boolean = false
 )
 
 @JsonIgnoreProperties(ignoreUnknown = true)

datalogger/src/main/java/org/obd/graphs/bl/trip/TripRepository.kt

@@ -148,7 +148,7 @@ internal class FileTripRepository(
             .filter {
                 try {
                     parser.decodeTripName(it).size > 3
-                } catch (e: Throwable) {
+                } catch (_ : Throwable) {
                     false
                 }
             }.mapNotNull { fileName ->

integrations/build.gradle

@@ -46,6 +46,9 @@ dependencies {
     implementation project(":datalogger")
     implementation("com.google.code.gson:gson:2.10.1")
 
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3"
+    implementation "androidx.work:work-runtime-ktx:2.9.1"
+
     // This specific library provides lifecycleScope
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
     // (Optional) If you are using it in a ViewModel, you might also need:

integrations/src/main/java/org/obd/graphs.integrations/gcp/authorization/SilentAuthorization.kt

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019-2026, Tomasz Żebrowski
+ *
+ * <p>Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.obd.graphs.integrations.gcp.authorization
+
+import android.content.Context
+import android.util.Log
+import com.google.android.gms.auth.api.identity.AuthorizationRequest
+import com.google.android.gms.auth.api.identity.Identity
+import com.google.android.gms.common.api.Scope
+import com.google.api.services.drive.DriveScopes
+import kotlinx.coroutines.tasks.await
+
+private const val TAG = "SilentAuth"
+
+internal object SilentAuthorization {
+
+    suspend fun getAccessTokenSilently(context: Context): String? {
+        return try {
+            val authorizationClient = Identity.getAuthorizationClient(context)
+            val request = AuthorizationRequest.Builder()
+                .setRequestedScopes(listOf(Scope(DriveScopes.DRIVE_FILE), Scope(DriveScopes.DRIVE_APPDATA)))
+                .build()
+
+            val result = authorizationClient.authorize(request).await()
+
+            if (result.hasResolution()) {
+                Log.w(TAG, "Silent auth failed: UI resolution required.")
+                null // We cannot show UI in the background
+            } else {
+                Log.i(TAG, "Silent auth successful.")
+                result.accessToken
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Silent auth threw an exception", e)
+            null
+        }
+    }
+}

integrations/src/main/java/org/obd/graphs.integrations/gcp/gdrive/AbstractDriveManager.kt

@@ -23,7 +23,6 @@ import com.google.android.gms.auth.GoogleAuthUtil
 import com.google.android.gms.common.api.Scope
 import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.client.http.AbstractInputStreamContent
-import com.google.api.client.http.FileContent
 import com.google.api.client.http.HttpRequestInitializer
 import com.google.api.client.http.javanet.NetHttpTransport
 import com.google.api.client.json.gson.GsonFactory
@@ -32,10 +31,8 @@ import com.google.api.services.drive.DriveScopes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.obd.graphs.integrations.gcp.authorization.AuthorizationManager
-import java.io.File
 import java.io.FileNotFoundException
 import java.io.InputStream
-import com.google.api.services.drive.model.File as DriveFile
 
 private const val APP_NAME = "MyGiuliaBackup"
 private const val TAG = "AbstractDriveManager"
@@ -108,98 +105,6 @@ internal abstract class AbstractDriveManager(
         }
     }
 
-    fun Drive.uploadFile(
-        content: InputStreamContent,
-        parentFolderId: String
-    ): DriveFile {
-        Log.i(TAG, "Uploading file ${content.fileName}")
-        val metadata =
-            DriveFile().apply {
-                name = content.fileName
-                parents = listOf(parentFolderId)
-            }
-
-        val uploaded =
-            this
-                .files()
-                .create(metadata, content)
-                .setFields("id")
-                .execute()
-
-        Log.i(TAG, "Uploaded ${content.fileName}, ID: ${uploaded.id}")
-        return uploaded
-    }
-
-    fun Drive.uploadFile(
-        localFile: File,
-        fileName: String,
-        parentFolderId: String,
-        mimeType: String = "text/plain"
-    ): DriveFile {
-        Log.i(TAG, "Uploading file ${localFile.absolutePath} to $fileName")
-        val metadata =
-            DriveFile().apply {
-                name = fileName
-                parents = listOf(parentFolderId)
-            }
-        val content = FileContent(mimeType, localFile)
-
-        val uploaded =
-            this
-                .files()
-                .create(metadata, content)
-                .setFields("id")
-                .execute()
-
-        Log.i(TAG, "Uploaded ${localFile.name}, ID: ${uploaded.id} as $fileName")
-        return uploaded
-    }
-
-    protected fun Drive.findFolderIdRecursive(path: String): String {
-        val folderNames = path.split("/").filter { it.isNotEmpty() }
-        var currentParentId = "root"
-        for (folderName in folderNames) {
-            currentParentId = findOrCreateSingleFolder(this, folderName, currentParentId)
-        }
-        return currentParentId
-    }
-
-    private fun findOrCreateSingleFolder(
-        drive: Drive,
-        folderName: String,
-        parentId: String
-    ): String {
-        val query =
-            "mimeType = 'application/vnd.google-apps.folder' and name = '$folderName' and '$parentId' in parents and trashed = false"
-
-        val files =
-            drive
-                .files()
-                .list()
-                .setQ(query)
-                .setSpaces("drive")
-                .setFields("files(id, name)")
-                .execute()
-                .files
-
-        return if (files.isNotEmpty()) {
-            files.first().id
-        } else {
-            val metadata =
-                DriveFile().apply {
-                    name = folderName
-                    mimeType = "application/vnd.google-apps.folder"
-                    parents = listOf(parentId)
-                }
-            drive
-                .files()
-                .create(metadata)
-                .setFields("id")
-                .execute()
-                .id
-        }
-    }
-
     private fun credentials(accessToken: String): HttpRequestInitializer =
         HttpRequestInitializer { request ->
             request.headers.authorization = "Bearer $accessToken"