fix wear not selecting default tags

Author: Razeeman

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

@@ -17,5 +17,5 @@ object Base {
     const val targetSDKWear = 34
 
     // Raise after wear api changes.
-    const val wearApiVersion = 5
+    const val wearApiVersion = 6
 }

features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataRepo.kt

@@ -10,6 +10,7 @@ import com.example.util.simpletimetracker.core.interactor.StatisticsMediator
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.provider.ApplicationDataProvider
 import com.example.util.simpletimetracker.domain.activitySuggestion.interactor.GetCurrentActivitySuggestionsInteractor
+import com.example.util.simpletimetracker.domain.extension.orFalse
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
@@ -168,7 +169,7 @@ class WearDataRepo @Inject constructor(
                 )
             },
             comment = "",
-            useSelectedTags = true,
+            useSelectedTags = request.useSelectedTags.orFalse(),
         )
         if (recordTypeInteractor.get(typeId)?.defaultDuration.orZero() > 0) {
             updateExternalViewsInteractor.get().onInstantRecordAdd()

wear/src/main/java/com/example/util/simpletimetracker/data/WearDataRepo.kt

@@ -115,7 +115,11 @@ class WearDataRepo @Inject constructor(
         }
     }
 
-    suspend fun startActivity(id: Long, tags: List<WearRecordTag>): Result<Unit> = mutex.withLock {
+    suspend fun startActivity(
+        id: Long,
+        tags: List<WearRecordTag>,
+        useSelectedTags: Boolean,
+    ): Result<Unit> = mutex.withLock {
         return runCatching {
             val request = WearStartActivityRequest(
                 id = id,
@@ -125,6 +129,7 @@ class WearDataRepo @Inject constructor(
                         numericValue = it.numericValue,
                     )
                 },
+                useSelectedTags = useSelectedTags,
             )
             wearRPCClient.startActivity(request)
         }

wear/src/main/java/com/example/util/simpletimetracker/domain/mediator/StartActivityMediator.kt

@@ -33,15 +33,24 @@ class StartActivityMediator @Inject constructor(
             onRequestTagSelection()
             Result.success(Unit)
         } else {
-            start(activityId, emptyList())
+            start(
+                activityId = activityId,
+                tags = emptyList(),
+                useSelectedTags = false,
+            )
         }
     }
 
     suspend fun start(
         activityId: Long,
         tags: List<WearRecordTag>,
+        useSelectedTags: Boolean,
     ): Result<Unit> {
-        return wearDataRepo.startActivity(activityId, tags)
+        return wearDataRepo.startActivity(
+            id = activityId,
+            tags = tags,
+            useSelectedTags = useSelectedTags,
+        )
     }
 
     suspend fun stop(currentId: Long): Result<Unit> {

wear/src/main/java/com/example/util/simpletimetracker/features/tagsSelection/viewModel/TagsViewModel.kt

@@ -185,6 +185,7 @@ class TagsViewModel @Inject constructor(
         val result = startActivityMediator.start(
             activityId = activityId,
             tags = selectedTags,
+            useSelectedTags = true,
         )
         if (result.isFailure) {
             showError()

wear/src/test/java/com/example/util/simpletimetracker/wear/StartActivityMediatorTest.kt

@@ -59,7 +59,11 @@ class StartActivityMediatorTest {
         )
 
         // Then
-        Mockito.verify(wearDataRepo).startActivity(sampleActivity.id, emptyList())
+        Mockito.verify(wearDataRepo).startActivity(
+            id = sampleActivity.id,
+            tags = emptyList(),
+            useSelectedTags = false,
+        )
         assertEquals(false, onRequestTagSelectionCalled)
         assertEquals(true, onProgressChanged)
     }
@@ -85,7 +89,11 @@ class StartActivityMediatorTest {
         )
 
         // Then
-        Mockito.verify(wearDataRepo, Mockito.never()).startActivity(sampleActivity.id, emptyList())
+        Mockito.verify(wearDataRepo, Mockito.never()).startActivity(
+            id = sampleActivity.id,
+            tags = emptyList(),
+            useSelectedTags = false,
+        )
         assertEquals(true, onRequestTagSelectionCalled)
         assertEquals(false, onProgressChanged)
     }

wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/WearDTO.kt

@@ -134,6 +134,8 @@ data class WearStartActivityRequest(
     val id: Long?,
     @SerializedName("tags")
     val tags: List<Tag?>?,
+    @SerializedName("useSelectedTags")
+    val useSelectedTags: Boolean?,
 ) : Parcelable {
 
     @Parcelize