chore: clear pending updates before fetching update

ooni · Jun 20, 2024 · f7cd7fc · f7cd7fc
1 parent 4e631a1
commit f7cd7fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
@@ -202,6 +202,7 @@ private void onPeriodicWorkComplete(WorkInfo workInfo) {
     }
 
     public void fetchManualUpdate() {
+        updatesViewModel.clearDescriptors();
         OneTimeWorkRequest manualWorkRequest = new OneTimeWorkRequest.Builder(ManualUpdateDescriptorsWorker.class)
                 .setConstraints(
                         new Constraints.Builder()

diff --git a/...g/openobservatory/ooniprobe/activity/reviewdescriptorupdates/AvailableUpdatesViewModel.kt b/...g/openobservatory/ooniprobe/activity/reviewdescriptorupdates/AvailableUpdatesViewModel.kt
@@ -10,14 +10,16 @@ import javax.inject.Singleton
 @Singleton
 class AvailableUpdatesViewModel @Inject() constructor(var gson: Gson) : ViewModel() {
     var descriptors: MutableLiveData<List<ITestDescriptor>> = MutableLiveData()
-    var descriptorString: MutableLiveData<String> = MutableLiveData()
 
     fun setDescriptorsWith(descriptorJson: String) {
-        descriptorString.value = descriptorJson
         descriptors.value = gson.fromJson(descriptorJson, Array<ITestDescriptor>::class.java).toList()
     }
 
     fun getUpdatedDescriptor(runId: Long): String {
         return gson.toJson(arrayOf(descriptors.value?.find { it.runId == runId }))
     }
+
+    fun clearDescriptors() {
+        descriptors.value = emptyList()
+    }
 }