feat: force user to google sigin when enable auto-sync

Author: tzebrowski

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

@@ -50,6 +50,7 @@ import org.obd.graphs.bl.drag.dragRacingMetricsProcessor
 import org.obd.graphs.bl.extra.vehicleStatusMetricsProcessor
 import org.obd.graphs.bl.gps.gpsMetricsEmitter
 import org.obd.graphs.bl.trip.tripManager
+import org.obd.graphs.integrations.gcp.gdrive.TripLogDriveManager
 import org.obd.graphs.language.LanguageManager
 import org.obd.graphs.preferences.setPreferencesContext
 import org.obd.graphs.profile.profile
@@ -69,6 +70,9 @@ class MainActivity :
 
     internal val screenLockManager = ScreenLockManager(this)
     internal lateinit var backupManager: BackupManager
+
+    internal lateinit var tripLogDriveManager: TripLogDriveManager
+
     internal lateinit var appBarConfiguration: AppBarConfiguration
 
     val drawerLayout: DrawerLayout by lazy { findViewById(R.id.drawer_layout) }
@@ -121,6 +125,8 @@ class MainActivity :
 
         supportActionBar?.hide()
         backupManager = BackupManager(this)
+        tripLogDriveManager = TripLogDriveManager.instance(getString(R.string.ANDROID_WEB_CLIENT_ID), activity = this, null)
+
         setupFabButtons()
 
         if (savedInstanceState == null) {

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

@@ -39,6 +39,7 @@ import org.obd.graphs.BACKUP_START
 import org.obd.graphs.BACKUP_SUCCESSFUL
 import org.obd.graphs.GOOGLE_SIGN_IN_GENERAL_FAILURE
 import org.obd.graphs.GOOGLE_SIGN_IN_NO_CREDENTIAL_FAILURE
+import org.obd.graphs.GOOGLE_SIGN_IN_REQUEST
 import org.obd.graphs.MODULES_LIST_CHANGED_EVENT
 import org.obd.graphs.Notifications
 import org.obd.graphs.Permissions
@@ -127,7 +128,13 @@ internal fun MainActivity.receive(intent: Intent?) {
         TRIPS_UPLOAD_SUCCESSFUL -> toast(org.obd.graphs.commons.R.string.main_activity_toast_trips_upload_successful)
         TRIPS_UPLOAD_NO_FILES_SELECTED -> toast(org.obd.graphs.commons.R.string.main_activity_toast_trips_upload_no_files_selected)
 
-        TRIPS_UPLOAD_FAILED_NO_TOKEN -> {
+        GOOGLE_SIGN_IN_REQUEST -> {
+            lifecycleScope.launch {
+                tripLogDriveManager.authenticate()
+            }
+        }
+
+        TRIPS_UPLOAD_FAILED_NO_TOKEN ->
             Notifications.show(
                 context = applicationContext,
                 notificationId = 9999,
@@ -146,7 +153,6 @@ internal fun MainActivity.receive(intent: Intent?) {
                 },
                 isOngoing = false
             )
-        }
 
         BACKUP_FAILED -> toast(org.obd.graphs.commons.R.string.main_activity_toast_backup_failed)
         BACKUP_SUCCESSFUL -> toast(org.obd.graphs.commons.R.string.main_activity_toast_backup_successful)
@@ -420,6 +426,7 @@ internal fun MainActivity.registerReceiver() {
         it.addAction(PROFILE_NAME_CHANGED_EVENT)
         it.addAction(TRIP_LOG_WRITE_COMPLETED)
         it.addAction(TRIPS_UPLOAD_FAILED_NO_TOKEN)
+        it.addAction(GOOGLE_SIGN_IN_REQUEST)
     }
 
     registerReceiver(this, DataLoggerRepository.broadcastReceivers()) {

app/src/main/java/org/obd/graphs/preferences/DriveAutoSyncEnablerCheckBoxPreference.kt

@@ -0,0 +1,57 @@
+/*
+ * 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.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import android.util.Log
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.SwitchPreferenceCompat
+import org.obd.graphs.GOOGLE_SIGN_IN_REQUEST
+import org.obd.graphs.R
+import org.obd.graphs.sendBroadcastEvent
+
+private const val LOG_TAG = "DriveAutoSyncEnablerCheckBoxPreference"
+
+class DriveAutoSyncEnablerCheckBoxPreference(
+    context: Context,
+    attrs: AttributeSet?
+) : SwitchPreferenceCompat(context, attrs) {
+
+    init {
+        setOnPreferenceChangeListener { _, newValue ->
+            val isEnabling = newValue as Boolean
+            if (isEnabling) {
+                AlertDialog
+                    .Builder(context)
+                    .setTitle(context.getString(R.string.pref_trips_drive_auto_sync_enabled_sign_in_dialog_title))
+                    .setMessage(context.getString(R.string.pref_trips_drive_auto_sync_enabled_sign_in_dialog_summary))
+                    .setCancelable(false)
+                    .setPositiveButton(context.getString(R.string.dialog_ask_question_yes)) { _, _ ->
+                        sendBroadcastEvent(GOOGLE_SIGN_IN_REQUEST)
+                        isChecked = true
+                    }.setNegativeButton(context.getString(R.string.dialog_ask_question_no)) { dialog, _ ->
+                        Log.i(LOG_TAG, "Disabling google drive auto sync")
+                        dialog.dismiss()
+                    }.show()
+                false
+            } else {
+                true
+            }
+        }
+    }
+}

app/src/main/res/values-pl/strings.xml

@@ -428,6 +428,9 @@
 
     <string name="pref.trips.drive.auto_sync_enabled">Automatyczna synchronizacja z Dyskiem Google</string>
     <string name="pref.trips.drive.auto_sync_enabled_summary">Automatycznie przesyłaj nowe przejazdy na Dysk Google po połączeniu z siecią Wi-Fi. Uwaga: Najpierw należy ręcznie przesłać przejazd w aplikacji, aby przyznać uprawnienia.</string>
+    <string name="pref.trips.drive.auto_sync_enabled.sign_in.dialog_title">Wymagane logowanie do Dysku Google</string>
+    <string name="pref.trips.drive.auto_sync_enabled.sign_in.dialog_summary">Aby automatycznie tworzyć kopie zapasowe przejazdów w tle, MyGiulia potrzebuje uprawnień do zapisywania plików na Twoim Dysku Google.\n\nZaloguj się na swoje konto Google na następnym ekranie, aby włączyć automatyczną synchronizację.</string>
+
 
     <string name="pref.view_category_summary">W tej sekcji możesz dostosować ustawienia związane z widokami Gauge, Wykres i Giulia.</string>
     <string name="pref.view_category">Widoki</string>

app/src/main/res/values/strings.xml

@@ -2,9 +2,6 @@
     <string name="nav_open">Open</string>
     <string name="nav_close">Close</string>
 
-
-
-
     <string name="pref.performance.screen_label_y_padding"><b><i>Gauge</i></b> label top offset</string>
     <string name="pref.performance.screen_top_margin">Top margin</string>
 
@@ -425,10 +422,14 @@
     <string name="pref.dash_enable_drag_and_drop">Enable drag and drop</string>
     <string name="pref.dash_swipe_to_delete">Enable swipe to delete metric</string>
     <string name="pref.dash_top_values_blink">Alarm for highest values</string>
+
     <string name="pref.trips_category">Trips</string>
     <string name="pref.trips.title">Recorded trips</string>
     <string name="pref.trips.drive.auto_sync_enabled">Auto-Sync to Google Drive</string>
     <string name="pref.trips.drive.auto_sync_enabled_summary">Automatically upload new trips to Google Drive when connected to Wi-Fi. Note: You should upload a trip manually in the app first to grant permissions.</string>
+    <string name="pref.trips.drive.auto_sync_enabled.sign_in.dialog_title">Google Drive Sign-In Required</string>
+    <string name="pref.trips.drive.auto_sync_enabled.sign_in.dialog_summary">To automatically back up your trips in the background, MyGiulia needs permission to save files to your Google Drive. \n\nPlease sign in with your Google account on the next screen to enable auto-sync.</string>
+
 
     <string name="pref.view_category_summary">In this section, you can adjust settings related to the Gauge, Graph, and Giulia views.</string>
     <string name="pref.view_category">Views</string>

app/src/main/res/xml/preferences.xml

@@ -9,7 +9,7 @@
         android:persistent="false" />
 
     <PreferenceCategory android:title="@string/pref.trips.title">
-        <SwitchPreferenceCompat
+        <org.obd.graphs.preferences.DriveAutoSyncEnablerCheckBoxPreference
                 android:defaultValue="false"
                 android:dialogTitle="@string/pref.trips.drive.auto_sync_enabled"
                 android:key="pref.trips.drive.auto_sync"

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

@@ -54,6 +54,8 @@ const val TRIPS_UPLOAD_NO_FILES_SELECTED = "trips.upload.no_files"
 
 const val TRIPS_UPLOAD_FAILED_NO_TOKEN = "trips.upload.no_token"
 
+const val GOOGLE_SIGN_IN_REQUEST = "gdrive.authorization.token_requests"
+
 const val GOOGLE_SIGN_IN_GENERAL_FAILURE = "gdrive.authorization.failed"
 const val GOOGLE_SIGN_IN_NO_CREDENTIAL_FAILURE = "gdrive.authorization.no_credentials.failed"
 

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

@@ -17,6 +17,7 @@
 package org.obd.graphs.integrations.gcp.gdrive
 
 import android.app.Activity
+import android.util.Log
 import androidx.fragment.app.Fragment
 import org.obd.graphs.SCREEN_UNLOCK_PROGRESS_EVENT
 import org.obd.graphs.TRIPS_UPLOAD_FAILED
@@ -33,6 +34,13 @@ internal open class ManualTripLogUpload(
     fragment: Fragment?
 ) : AbstractDriveManager(webClientId, activity, fragment),
     TripLogDriveManager {
+
+    override suspend fun authenticate() =
+        signInAndExecute("authenticate_for_auto_sync") { token ->
+            Log.i("ManualTripLogUpload", "Successfully authenticated user for background Auto-Sync!")
+            sendBroadcastEvent(SCREEN_UNLOCK_PROGRESS_EVENT)
+        }
+
     override suspend fun uploadTrips(files: List<File>) =
         signInAndExecute("exportTrips") { token ->
             executeDriveOperation(

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

@@ -23,6 +23,7 @@ import java.io.File
 interface TripLogDriveManager {
     suspend fun uploadTrips(files: List<File>)
 
+    suspend fun authenticate()
     companion object {
         fun instance(
             webClientId: String,

integrations/src/test/java/org/obd/graphs/integrations/gcp/gdrive/TripLogDriveManagerTest.kt

@@ -34,6 +34,12 @@ class TripLogDriveManagerTest {
 
     // Subclass to expose logic wrapped in the executeDriveOperation block
     private inner class TestableTripLogManager : ManualTripLogUpload("client", activity, null) {
+        override suspend fun authenticate() =
+            signInAndExecute("authenticate_for_auto_sync") { token ->
+                // If we get here, the user successfully signed in and the token is cached!
+                // No need to do anything else. The background worker will now work.
+            }
+
         fun testUploadLogic(files: List<File>) {
             if (files.isEmpty()) {
                 sendBroadcastEvent(TRIPS_UPLOAD_NO_FILES_SELECTED)