Remove unused code (#2025)

google · Oct 30, 2023 · bbbb4da · bbbb4da
1 parent 8bc3f9a
commit bbbb4da
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/BaseDao.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/BaseDao.kt
@@ -18,7 +18,6 @@ package com.google.android.ground.persistence.local.room.dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Update
-import io.reactivex.Completable
 
 /**
  * Base interface for DAOs that implement operations on a specific entity type.
@@ -27,18 +26,13 @@ import io.reactivex.Completable
  */
 interface BaseDao<E> {
 
-  /** Insert entity into local db. Main-safe. */
   @Insert suspend fun insert(entity: E)
 
-  /** Update entity in local db. Main-safe. */
   @Update suspend fun update(entity: E): Int
 
   @Update suspend fun updateAll(entities: List<E>)
 
-  @Deprecated("Replace usage with deleteSuspend") @Delete fun delete(entity: E): Completable
-
-  // TODO(#1581): Rename to delete once all existing usages are migrated to coroutine.
-  @Delete suspend fun deleteSuspend(entity: E)
+  @Delete suspend fun delete(entity: E)
 }
 
 /** Try to update the specified entity, and if it doesn't yet exist, create it. Main-safe. */

diff --git a/...va/com/google/android/ground/persistence/local/room/stores/RoomLocationOfInterestStore.kt b/...va/com/google/android/ground/persistence/local/room/stores/RoomLocationOfInterestStore.kt
@@ -121,7 +121,7 @@ class RoomLocationOfInterestStore @Inject internal constructor() : LocalLocation
   override suspend fun deleteLocationOfInterest(locationOfInterestId: String) {
     Timber.d("Deleting local location of interest : $locationOfInterestId")
     locationOfInterestDao.findByIdSuspend(locationOfInterestId)?.let {
-      locationOfInterestDao.deleteSuspend(it)
+      locationOfInterestDao.delete(it)
     }
   }
 

diff --git a/.../main/java/com/google/android/ground/persistence/local/room/stores/RoomSubmissionStore.kt b/.../main/java/com/google/android/ground/persistence/local/room/stores/RoomSubmissionStore.kt
@@ -192,7 +192,7 @@ class RoomSubmissionStore @Inject internal constructor() : LocalSubmissionStore
   }
 
   override suspend fun deleteSubmission(submissionId: String) {
-    submissionDao.findByIdSuspend(submissionId)?.let { submissionDao.deleteSuspend(it) }
+    submissionDao.findByIdSuspend(submissionId)?.let { submissionDao.delete(it) }
   }
 
   override fun getSubmissionMutationsByLocationOfInterestIdOnceAndStream(

diff --git a/.../src/main/java/com/google/android/ground/persistence/local/room/stores/RoomSurveyStore.kt b/.../src/main/java/com/google/android/ground/persistence/local/room/stores/RoomSurveyStore.kt
@@ -79,7 +79,7 @@ class RoomSurveyStore @Inject internal constructor() : LocalSurveyStore {
 
   /** Deletes the provided [Survey] from the local database, if it exists in the database. */
   override suspend fun deleteSurvey(survey: Survey) =
-    surveyDao.deleteSuspend(survey.toLocalDataStoreObject())
+    surveyDao.delete(survey.toLocalDataStoreObject())
 
   private suspend fun insertOrUpdateOption(taskId: String, option: Option) =
     optionDao.insertOrUpdate(option.toLocalDataStoreObject(taskId))