Update project icon in main menu after returning from Admin Settings

grzesiek2010 · May 5, 2021 · 2883101 · 2883101
1 parent fc9da78
commit 2883101
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/MainMenuActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/MainMenuActivity.java
@@ -212,7 +212,7 @@ protected void onResume() {
         mainMenuViewModel.resume();
 
         setButtonsVisibility();
-        invalidateOptionsMenu();
+        currentProjectViewModel.refresh();
     }
 
     private void setButtonsVisibility() {

diff --git a/...pp/src/main/java/org/odk/collect/android/activities/viewmodels/CurrentProjectViewModel.kt b/...pp/src/main/java/org/odk/collect/android/activities/viewmodels/CurrentProjectViewModel.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider
 import org.odk.collect.android.projects.CurrentProjectProvider
 import org.odk.collect.projects.Project
 
-class CurrentProjectViewModel(currentProjectProvider: CurrentProjectProvider) : ViewModel() {
+class CurrentProjectViewModel(private val currentProjectProvider: CurrentProjectProvider) : ViewModel() {
 
     private val _currentProject = MutableLiveData(currentProjectProvider.getCurrentProject()!!)
     val currentProject: LiveData<Project> = _currentProject
@@ -16,6 +16,12 @@ class CurrentProjectViewModel(currentProjectProvider: CurrentProjectProvider) :
         _currentProject.postValue(project)
     }
 
+    fun refresh() {
+        if (currentProject.value != currentProjectProvider.getCurrentProject()) {
+            _currentProject.postValue(currentProjectProvider.getCurrentProject())
+        }
+    }
+
     open class Factory constructor(private val currentProjectProvider: CurrentProjectProvider) : ViewModelProvider.Factory {
         override fun <T : ViewModel?> create(modelClass: Class<T>): T {
             return CurrentProjectViewModel(currentProjectProvider) as T