Improve updating the banner

getodk · Sep 15, 2023 · e52bf13 · e52bf13
1 parent 86adad6
commit e52bf13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/...in/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderListActivity.java b/...in/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderListActivity.java
@@ -420,8 +420,6 @@ protected void onSaveInstanceState(Bundle outState) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        readyToSendViewModel.update();
-
         if (resultCode == RESULT_CANCELED) {
             multiSelectViewModel.unselectAll();
             return;
@@ -479,6 +477,7 @@ public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
         } else {
             findViewById(R.id.buttonholder).setVisibility(View.VISIBLE);
         }
+        readyToSendViewModel.update();
     }
 
     @Override

diff --git a/...app/src/main/java/org/odk/collect/android/instancemanagement/send/ReadyToSendViewModel.kt b/...app/src/main/java/org/odk/collect/android/instancemanagement/send/ReadyToSendViewModel.kt
@@ -17,10 +17,6 @@ class ReadyToSendViewModel(
     private val _data = MutableLiveData<Data>()
     val data: LiveData<Data> = _data
 
-    init {
-        update()
-    }
-
     fun update() {
         scheduler.immediate(
             background = {

diff --git a/...src/test/java/org/odk/collect/android/instancemanagement/send/ReadyToSendViewModelTest.kt b/...src/test/java/org/odk/collect/android/instancemanagement/send/ReadyToSendViewModelTest.kt
@@ -73,7 +73,9 @@ class ReadyToSendViewModelTest {
     }
     private val scheduler = FakeScheduler()
 
-    private val viewModel = ReadyToSendViewModel(instancesRepository, scheduler) { TimeInMs.ONE_SECOND * 10 }
+    private val viewModel = ReadyToSendViewModel(instancesRepository, scheduler) { TimeInMs.ONE_SECOND * 10 }.apply {
+        update()
+    }
 
     @Test
     fun `numberOfSentInstances should represent the real number of instances with STATUS_SUBMITTED in the database`() {