Fix detekt warnings

google · Jan 19, 2025 · 4561db1 · 4561db1
1 parent 10b297a
commit 4561db1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/app/src/main/java/com/google/android/ground/domain/usecases/survey/SyncSurveyUseCase.kt b/app/src/main/java/com/google/android/ground/domain/usecases/survey/SyncSurveyUseCase.kt
@@ -20,9 +20,9 @@ import com.google.android.ground.model.Survey
 import com.google.android.ground.persistence.local.stores.LocalSurveyStore
 import com.google.android.ground.persistence.remote.RemoteDataStore
 import com.google.android.ground.repository.LocationOfInterestRepository
+import javax.inject.Inject
 import kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
-import javax.inject.Inject
 
 private const val LOAD_REMOTE_SURVEY_TIMEOUT_MILLS: Long = 15 * 1000
 
@@ -42,9 +42,8 @@ constructor(
   private val remoteDataStore: RemoteDataStore,
 ) {
 
-  suspend operator fun invoke(surveyId: String): Survey? {
-    return fetchSurvey(surveyId)?.also { syncSurvey(it) }
-  }
+  suspend operator fun invoke(surveyId: String): Survey? =
+    fetchSurvey(surveyId)?.also { syncSurvey(it) }
 
   private suspend fun fetchSurvey(surveyId: String): Survey? =
     withTimeoutOrNull(LOAD_REMOTE_SURVEY_TIMEOUT_MILLS) {

diff --git a/app/src/main/java/com/google/android/ground/repository/SurveyRepository.kt b/app/src/main/java/com/google/android/ground/repository/SurveyRepository.kt
@@ -26,6 +26,8 @@ import com.google.android.ground.persistence.local.stores.LocalSurveyStore
 import com.google.android.ground.persistence.remote.RemoteDataStore
 import com.google.android.ground.system.NetworkManager
 import com.google.android.ground.system.NetworkStatus
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -41,10 +43,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
-import javax.inject.Inject
-import javax.inject.Singleton
-
-private const val LOAD_REMOTE_SURVEY_TIMEOUT_MILLS: Long = 15 * 1000
 
 /**
  * Coordinates persistence and retrieval of [Survey] instances from remote, local, and in memory

diff --git a/app/src/test/java/com/google/android/ground/domain/usecase/SyncSurveyUseCaseTest.kt b/app/src/test/java/com/google/android/ground/domain/usecase/SyncSurveyUseCaseTest.kt
@@ -26,14 +26,14 @@ import com.sharedtest.FakeData.SURVEY
 import com.sharedtest.persistence.remote.FakeRemoteDataStore
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertThrows
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.verify
 import org.robolectric.RobolectricTestRunner
-import javax.inject.Inject
 
 @HiltAndroidTest
 @RunWith(RobolectricTestRunner::class)