fix: pop message called multiple times (#2278)

Author: anhanh11001

app/src/fdroid/java/org/fossasia/openevent/general/search/location/GeoLocationViewModel.kt

@@ -11,7 +11,7 @@ class GeoLocationViewModel(private val locationService: LocationService) : ViewM
     private val mutableLocation = SingleLiveEvent<String>()
     val location: LiveData<String> = mutableLocation
     private val mutableErrorMessage = SingleLiveEvent<String>()
-    val errorMessage: LiveData<String> = mutableErrorMessage
+    val errorMessage: SingleLiveEvent<String> = mutableErrorMessage
     private val compositeDisposable = CompositeDisposable()
 
     fun configure() {

app/src/main/java/org/fossasia/openevent/general/StartupViewModel.kt

@@ -38,7 +38,7 @@ class StartupViewModel(
     private val mutableResetPasswordEmail = MutableLiveData<String>()
     val resetPasswordEmail: LiveData<String> = mutableResetPasswordEmail
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
 
     fun isLoggedIn() = authHolder.isLoggedIn()
 

app/src/main/java/org/fossasia/openevent/general/about/AboutEventViewModel.kt

@@ -22,11 +22,11 @@ class AboutEventViewModel(private val eventService: EventService, private val re
     private val mutableEvent = MutableLiveData<Event>()
     val event: LiveData<Event> = mutableEvent
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
 
     fun loadEvent(id: Long) {
         if (id == -1L) {
-            mutableError.value = Resource().getString(R.string.error_fetching_event_message)
+            mutableError.value = resource.getString(R.string.error_fetching_event_message)
             return
         }
         compositeDisposable += eventService.getEvent(id)

app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt

@@ -63,7 +63,7 @@ class AttendeeViewModel(
     private val mutableTicketSoldOut = MutableLiveData<Boolean>()
     val ticketSoldOut: LiveData<Boolean> = mutableTicketSoldOut
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableEvent = MutableLiveData<Event>()
     val event: LiveData<Event> = mutableEvent
     private val mutableUser = MutableLiveData<User>()

app/src/main/java/org/fossasia/openevent/general/auth/AuthViewModel.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import org.fossasia.openevent.general.R
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
+import org.fossasia.openevent.general.common.SingleLiveEvent
 import org.fossasia.openevent.general.data.Network
 import org.fossasia.openevent.general.data.Resource
 import org.fossasia.openevent.general.utils.extensions.withDefaultSchedulers
@@ -20,10 +21,10 @@ class AuthViewModel(
     private val compositeDisposable = CompositeDisposable()
     private val mutableProgress = MutableLiveData<Boolean>()
     val progress: LiveData<Boolean> = mutableProgress
-    val mutableStatus = MutableLiveData<Boolean>()
+    val mutableStatus = SingleLiveEvent<Boolean>()
     val isUserExists: LiveData<Boolean> = mutableStatus
-    private val mutableError = MutableLiveData<String>()
-    val error: LiveData<String> = mutableError
+    private val mutableError = SingleLiveEvent<String>()
+    val error: SingleLiveEvent<String> = mutableError
 
     fun checkUser(email: String) {
         if (!network.isNetworkConnected()) {

app/src/main/java/org/fossasia/openevent/general/auth/EditProfileViewModel.kt

@@ -26,7 +26,7 @@ class EditProfileViewModel(
     private val mutableUser = MutableLiveData<User>()
     val user: LiveData<User> = mutableUser
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private var updatedImageTemp = MutableLiveData<File>()
     var avatarUpdated = false
     var encodedImage: String? = null

app/src/main/java/org/fossasia/openevent/general/auth/LoginViewModel.kt

@@ -28,7 +28,7 @@ class LoginViewModel(
     private val mutableUser = MutableLiveData<User>()
     val user: LiveData<User> = mutableUser
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
     private val mutableShowNoInternetDialog = MutableLiveData<Boolean>()
     val showNoInternetDialog: LiveData<Boolean> = mutableShowNoInternetDialog
     private val mutableRequestTokenSuccess = MutableLiveData<Boolean>()

app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt

@@ -118,7 +118,6 @@ class ProfileFragment : Fragment(), BottomIconDoubleClick {
             .nonNull()
             .observe(viewLifecycleOwner, Observer {
                 rootView.snackbar(it)
-                profileViewModel.mutableMessage.postValue(null)
             })
 
         profileViewModel.accountDeleted

app/src/main/java/org/fossasia/openevent/general/auth/ProfileViewModel.kt

@@ -9,13 +9,11 @@ import io.reactivex.rxkotlin.plusAssign
 import org.fossasia.openevent.general.utils.extensions.withDefaultSchedulers
 import org.fossasia.openevent.general.common.SingleLiveEvent
 import org.fossasia.openevent.general.data.Resource
-import org.fossasia.openevent.general.event.EventService
 import timber.log.Timber
 
 class ProfileViewModel(
     private val authService: AuthService,
-    private val resource: Resource,
-    private val eventService: EventService
+    private val resource: Resource
 ) : ViewModel() {
 
     private val compositeDisposable = CompositeDisposable()
@@ -24,8 +22,8 @@ class ProfileViewModel(
     val progress: LiveData<Boolean> = mutableProgress
     private val mutableUser = MutableLiveData<User>()
     val user: LiveData<User> = mutableUser
-    val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    private val mutableMessage = SingleLiveEvent<String>()
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableUpdatedUser = MutableLiveData<User>()
     val updatedUser: LiveData<User> = mutableUpdatedUser
     private val mutableUpdatedPassword = MutableLiveData<String>()
@@ -67,13 +65,13 @@ class ProfileViewModel(
             .withDefaultSchedulers()
             .subscribe({
                 if (it.passwordChanged) {
-                    mutableMessage.value = "Password changed successfully!"
+                    mutableMessage.value = resource.getString(R.string.change_password_success_message)
                     mutableUpdatedPassword.value = newPassword
                 }
             }, {
                 if (it.message.toString() == "HTTP 400 BAD REQUEST")
-                    mutableMessage.value = "Incorrect Old Password provided!"
-                else mutableMessage.value = "Unable to change password!"
+                    mutableMessage.value = resource.getString(R.string.incorrect_old_password_message)
+                else mutableMessage.value = resource.getString(R.string.change_password_fail_message)
             })
     }
 

app/src/main/java/org/fossasia/openevent/general/auth/SignUpViewModel.kt

@@ -24,11 +24,11 @@ class SignUpViewModel(
     private val mutableProgress = MutableLiveData<Boolean>()
     val progress: LiveData<Boolean> = mutableProgress
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
     private val mutableShowNoInternetDialog = MutableLiveData<Boolean>()
     val showNoInternetDialog: LiveData<Boolean> = mutableShowNoInternetDialog
     private val mutableLoggedIn = SingleLiveEvent<Boolean>()
-    var loggedIn: LiveData<Boolean> = mutableLoggedIn
+    var loggedIn: SingleLiveEvent<Boolean> = mutableLoggedIn
 
     var email: String? = null
     var password: String? = null

app/src/main/java/org/fossasia/openevent/general/di/Modules.kt

@@ -238,7 +238,7 @@ val viewModelModule = module {
     viewModel { LoginViewModel(get(), get(), get(), get()) }
     viewModel { EventsViewModel(get(), get(), get(), get(), get(), get()) }
     viewModel { StartupViewModel(get(), get(), get(), get(), get(), get()) }
-    viewModel { ProfileViewModel(get(), get(), get()) }
+    viewModel { ProfileViewModel(get(), get()) }
     viewModel { SignUpViewModel(get(), get(), get()) }
     viewModel {
         EventDetailsViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
@@ -253,7 +253,7 @@ val viewModelModule = module {
     viewModel { AboutEventViewModel(get(), get()) }
     viewModel { EventFAQViewModel(get(), get()) }
     viewModel { FavoriteEventsViewModel(get(), get(), get()) }
-    viewModel { SettingsViewModel(get(), get()) }
+    viewModel { SettingsViewModel(get(), get(), get()) }
     viewModel { OrderCompletedViewModel(get(), get(), get(), get()) }
     viewModel { OrdersUnderUserViewModel(get(), get(), get(), get(), get()) }
     viewModel { OrderDetailsViewModel(get(), get(), get(), get()) }

app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt

@@ -62,7 +62,7 @@ class EventDetailsViewModel(
     private val mutableUser = MutableLiveData<User>()
     val user: LiveData<User> = mutableUser
     private val mutablePopMessage = SingleLiveEvent<String>()
-    val popMessage: LiveData<String> = mutablePopMessage
+    val popMessage: SingleLiveEvent<String> = mutablePopMessage
     private val mutableEvent = MutableLiveData<Event>()
     val event: LiveData<Event> = mutableEvent
     private val mutableEventFeedback = MutableLiveData<List<Feedback>>()

app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt

@@ -41,7 +41,7 @@ class EventsViewModel(
     private val mutablePagedEvents = MutableLiveData<PagedList<Event>>()
     val pagedEvents: LiveData<PagedList<Event>> = mutablePagedEvents
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     var lastSearch = ""
     private val mutableSavedLocation = MutableLiveData<String>()
     val savedLocation: LiveData<String> = mutableSavedLocation

app/src/main/java/org/fossasia/openevent/general/event/faq/EventFAQViewModel.kt

@@ -18,7 +18,7 @@ class EventFAQViewModel(private val eventService: EventService, private val reso
     private val mutableEventFAQ = MutableLiveData<List<EventFAQ>>()
     val eventFAQ: LiveData<List<EventFAQ>> = mutableEventFAQ
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
 
     fun loadEventFaq(id: Long) {
         if (id == -1L) {

app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsViewModel.kt

@@ -26,7 +26,7 @@ class FavoriteEventsViewModel(
     private val mutableProgress = MutableLiveData<Boolean>()
     val progress: LiveData<Boolean> = mutableProgress
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableEvents = MutableLiveData<List<Event>>()
     val events: LiveData<List<Event>> = mutableEvents
 

app/src/main/java/org/fossasia/openevent/general/feedback/FeedbackViewModel.kt

@@ -19,7 +19,7 @@ class FeedbackViewModel(
     private val mutableFeedback = MutableLiveData<List<Feedback>>()
     val feedback: LiveData<List<Feedback>> = mutableFeedback
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableProgress = MutableLiveData<Boolean>(false)
     val progress: LiveData<Boolean> = mutableProgress
 

app/src/main/java/org/fossasia/openevent/general/notification/NotificationViewModel.kt

@@ -31,7 +31,7 @@ class NotificationViewModel(
     val noInternet: LiveData<Boolean> = mutableNoInternet
 
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
 
     fun getId() = authHolder.getId()
 

app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedViewModel.kt

@@ -32,7 +32,7 @@ class OrderCompletedViewModel(
     private val compositeDisposable = CompositeDisposable()
 
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableEvent = MutableLiveData<Event>()
     val event: LiveData<Event> = mutableEvent
     private val mutableProgress = MutableLiveData<Boolean>()

app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserViewModel.kt

@@ -28,7 +28,7 @@ class OrdersUnderUserViewModel(
 
     val connection: LiveData<Boolean> = mutableConnectionLiveData
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableEventAndOrderPaged = MutableLiveData<PagedList<Pair<Event, Order>>>()
     val eventAndOrderPaged: LiveData<PagedList<Pair<Event, Order>>> = mutableEventAndOrderPaged
     private val mutableShowShimmerResults = MutableLiveData<Boolean>()

app/src/main/java/org/fossasia/openevent/general/search/SearchResultsViewModel.kt

@@ -47,7 +47,7 @@ class SearchResultsViewModel(
     val pagedEvents: LiveData<PagedList<Event>> = mutablePagedEvents
     private val mutableEventTypes = MutableLiveData<List<EventType>>()
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     val eventTypes: LiveData<List<EventType>> = mutableEventTypes
     val connection: LiveData<Boolean> = mutableConnectionLiveData
 

app/src/main/java/org/fossasia/openevent/general/sessions/SessionViewModel.kt

@@ -26,7 +26,7 @@ class SessionViewModel(
     private val mutableProgress = MutableLiveData<Boolean>(true)
     val progress: LiveData<Boolean> = mutableProgress
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
     private val mutableSpeakers = MutableLiveData<List<Speaker>>()
     val speakersUnderSession: LiveData<List<Speaker>> = mutableSpeakers
 

app/src/main/java/org/fossasia/openevent/general/settings/SettingsViewModel.kt

@@ -6,22 +6,25 @@ import androidx.lifecycle.ViewModel
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.fossasia.openevent.general.BuildConfig
+import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.utils.extensions.withDefaultSchedulers
 import org.fossasia.openevent.general.auth.AuthService
 import org.fossasia.openevent.general.common.SingleLiveEvent
 import org.fossasia.openevent.general.data.Preference
+import org.fossasia.openevent.general.data.Resource
 import timber.log.Timber
 
 const val API_URL = "apiUrl"
 
 class SettingsViewModel(
     private val authService: AuthService,
-    private val preference: Preference
+    private val preference: Preference,
+    private val resource: Resource
 ) : ViewModel() {
 
     private val compositeDisposable = CompositeDisposable()
     private val mutableSnackBar = SingleLiveEvent<String>()
-    val snackBar: LiveData<String> = mutableSnackBar
+    val snackBar: SingleLiveEvent<String> = mutableSnackBar
     private val mutableUpdatedPassword = MutableLiveData<String>()
     val updatedPassword: LiveData<String> = mutableUpdatedPassword
 
@@ -50,13 +53,13 @@ class SettingsViewModel(
             .withDefaultSchedulers()
             .subscribe({
                 if (it.passwordChanged) {
-                    mutableSnackBar.value = "Password changed successfully!"
+                    mutableSnackBar.value = resource.getString(R.string.change_password_success_message)
                     mutableUpdatedPassword.value = newPassword
                 }
             }, {
                 if (it.message.toString() == "HTTP 400 BAD REQUEST")
-                    mutableSnackBar.value = "Incorrect Old Password provided!"
-                else mutableSnackBar.value = "Unable to change password!"
+                    mutableSnackBar.value = resource.getString(R.string.incorrect_old_password_message)
+                else mutableSnackBar.value = resource.getString(R.string.change_password_fail_message)
             })
     }
 

app/src/main/java/org/fossasia/openevent/general/speakercall/EditSpeakerViewModel.kt

@@ -29,7 +29,7 @@ class EditSpeakerViewModel(
     private val compositeDisposable = CompositeDisposable()
 
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableProgress = MutableLiveData<Boolean>(false)
     val progress: LiveData<Boolean> = mutableProgress
     private val mutableSpeaker = MutableLiveData<Speaker>()

app/src/main/java/org/fossasia/openevent/general/speakercall/SpeakersCallProposalFragment.kt

@@ -138,6 +138,12 @@ class SpeakersCallProposalFragment : Fragment(), ComplexBackPressFragment {
             .observe(viewLifecycleOwner, Observer {
                 rootView.speakerProgressBar.isVisible = it
             })
+
+        speakersCallProposalViewModel.message
+            .nonNull()
+            .observe(viewLifecycleOwner, Observer {
+                rootView.snackbar(it)
+            })
         rootView.speakerInfoContainer.isExpanded = speakersCallProposalViewModel.isSpeakerInfoShown
 
         rootView.titleLayout.setRequired()

app/src/main/java/org/fossasia/openevent/general/speakercall/SpeakersCallProposalViewModel.kt

@@ -30,7 +30,7 @@ class SpeakersCallProposalViewModel(
     private val compositeDisposable = CompositeDisposable()
 
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableSpeakerProgress = MutableLiveData(false)
     private val mutableProgress = MutableLiveData(false)
     val progress: LiveData<Boolean> = mutableProgress

app/src/main/java/org/fossasia/openevent/general/speakercall/SpeakersCallViewModel.kt

@@ -35,7 +35,7 @@ class SpeakersCallViewModel(
     private val mutableSessions = MutableLiveData<List<Session>>()
     val sessions: LiveData<List<Session>> = mutableSessions
     private val mutableMessage = SingleLiveEvent<String>()
-    val message: LiveData<String> = mutableMessage
+    val message: SingleLiveEvent<String> = mutableMessage
     private val mutableProgress = MutableLiveData(true)
     val progress: LiveData<Boolean> = mutableProgress
     private val mutableSpeaker = MutableLiveData<Speaker>()

app/src/main/java/org/fossasia/openevent/general/speakers/SpeakerViewModel.kt

@@ -22,11 +22,11 @@ class SpeakerViewModel(
     private val mutableSpeaker = MutableLiveData<Speaker>()
     val speaker: LiveData<Speaker> = mutableSpeaker
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
 
     fun loadSpeaker(id: Long) {
         if (id.equals(-1)) {
-            mutableError.value = Resource().getString(R.string.error_fetching_event_message)
+            mutableError.value = resource.getString(R.string.error_fetching_event_message)
             return
         }
         compositeDisposable += speakerService.fetchSpeaker(id)

app/src/main/java/org/fossasia/openevent/general/sponsor/SponsorsViewModel.kt

@@ -7,6 +7,7 @@ import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.fossasia.openevent.general.utils.extensions.withDefaultSchedulers
 import org.fossasia.openevent.general.R
+import org.fossasia.openevent.general.common.SingleLiveEvent
 import org.fossasia.openevent.general.data.Resource
 import timber.log.Timber
 
@@ -19,8 +20,8 @@ class SponsorsViewModel(
 
     private val mutableSponsors = MutableLiveData<List<Sponsor>>()
     val sponsors: LiveData<List<Sponsor>> = mutableSponsors
-    private val mutableError = MutableLiveData<String>()
-    val error: LiveData<String> = mutableError
+    private val mutableError = SingleLiveEvent<String>()
+    val error: SingleLiveEvent<String> = mutableError
     private val mutableProgress = MutableLiveData<Boolean>()
     val progress: LiveData<Boolean> = mutableProgress
 

app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt

@@ -36,7 +36,7 @@ class TicketsViewModel(
     val tickets = MutableLiveData<List<Ticket>>()
     val connection: LiveData<Boolean> = mutableConnectionLiveData
     private val mutableError = SingleLiveEvent<String>()
-    val error: LiveData<String> = mutableError
+    val error: SingleLiveEvent<String> = mutableError
     private val mutableEvent = MutableLiveData<Event>()
     val event: LiveData<Event> = mutableEvent
     private val mutableDiscountCodes = MutableLiveData<DiscountCode>()

app/src/main/java/org/fossasia/openevent/general/utils/extensions/LiveDataExtensions.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Observer
+import org.fossasia.openevent.general.common.SingleLiveEvent
 
 class NonNullMediatorLiveData<T> : MediatorLiveData<T>()
 
@@ -13,6 +14,8 @@ fun <T> LiveData<T>.nonNull(): NonNullMediatorLiveData<T> {
     return mediator
 }
 
+fun <T> SingleLiveEvent<T>.nonNull(): SingleLiveEvent<T> = this
+
 fun <T> NonNullMediatorLiveData<T>.observe(owner: LifecycleOwner, observer: (t: T) -> Unit) {
     this.observe(owner, Observer {
         it?.let(observer)