Skip to content

Commit dec8e44

Browse files
anhanh11001iamareebjamal
authored andcommitted
fix: pop message called multiple times (#2278)
1 parent ce78495 commit dec8e44

31 files changed

+64
-50
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class GeoLocationViewModel(private val locationService: LocationService) : ViewM
1111
private val mutableLocation = SingleLiveEvent<String>()
1212
val location: LiveData<String> = mutableLocation
1313
private val mutableErrorMessage = SingleLiveEvent<String>()
14-
val errorMessage: LiveData<String> = mutableErrorMessage
14+
val errorMessage: SingleLiveEvent<String> = mutableErrorMessage
1515
private val compositeDisposable = CompositeDisposable()
1616

1717
fun configure() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class StartupViewModel(
3838
private val mutableResetPasswordEmail = MutableLiveData<String>()
3939
val resetPasswordEmail: LiveData<String> = mutableResetPasswordEmail
4040
private val mutableMessage = SingleLiveEvent<String>()
41-
val message: LiveData<String> = mutableMessage
41+
val message: SingleLiveEvent<String> = mutableMessage
4242

4343
fun isLoggedIn() = authHolder.isLoggedIn()
4444

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ class AboutEventViewModel(private val eventService: EventService, private val re
2222
private val mutableEvent = MutableLiveData<Event>()
2323
val event: LiveData<Event> = mutableEvent
2424
private val mutableError = SingleLiveEvent<String>()
25-
val error: LiveData<String> = mutableError
25+
val error: SingleLiveEvent<String> = mutableError
2626

2727
fun loadEvent(id: Long) {
2828
if (id == -1L) {
29-
mutableError.value = Resource().getString(R.string.error_fetching_event_message)
29+
mutableError.value = resource.getString(R.string.error_fetching_event_message)
3030
return
3131
}
3232
compositeDisposable += eventService.getEvent(id)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class AttendeeViewModel(
6363
private val mutableTicketSoldOut = MutableLiveData<Boolean>()
6464
val ticketSoldOut: LiveData<Boolean> = mutableTicketSoldOut
6565
private val mutableMessage = SingleLiveEvent<String>()
66-
val message: LiveData<String> = mutableMessage
66+
val message: SingleLiveEvent<String> = mutableMessage
6767
private val mutableEvent = MutableLiveData<Event>()
6868
val event: LiveData<Event> = mutableEvent
6969
private val mutableUser = MutableLiveData<User>()

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
66
import org.fossasia.openevent.general.R
77
import io.reactivex.disposables.CompositeDisposable
88
import io.reactivex.rxkotlin.plusAssign
9+
import org.fossasia.openevent.general.common.SingleLiveEvent
910
import org.fossasia.openevent.general.data.Network
1011
import org.fossasia.openevent.general.data.Resource
1112
import org.fossasia.openevent.general.utils.extensions.withDefaultSchedulers
@@ -20,10 +21,10 @@ class AuthViewModel(
2021
private val compositeDisposable = CompositeDisposable()
2122
private val mutableProgress = MutableLiveData<Boolean>()
2223
val progress: LiveData<Boolean> = mutableProgress
23-
val mutableStatus = MutableLiveData<Boolean>()
24+
val mutableStatus = SingleLiveEvent<Boolean>()
2425
val isUserExists: LiveData<Boolean> = mutableStatus
25-
private val mutableError = MutableLiveData<String>()
26-
val error: LiveData<String> = mutableError
26+
private val mutableError = SingleLiveEvent<String>()
27+
val error: SingleLiveEvent<String> = mutableError
2728

2829
fun checkUser(email: String) {
2930
if (!network.isNetworkConnected()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class EditProfileViewModel(
2626
private val mutableUser = MutableLiveData<User>()
2727
val user: LiveData<User> = mutableUser
2828
private val mutableMessage = SingleLiveEvent<String>()
29-
val message: LiveData<String> = mutableMessage
29+
val message: SingleLiveEvent<String> = mutableMessage
3030
private var updatedImageTemp = MutableLiveData<File>()
3131
var avatarUpdated = false
3232
var encodedImage: String? = null

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class LoginViewModel(
2828
private val mutableUser = MutableLiveData<User>()
2929
val user: LiveData<User> = mutableUser
3030
private val mutableError = SingleLiveEvent<String>()
31-
val error: LiveData<String> = mutableError
31+
val error: SingleLiveEvent<String> = mutableError
3232
private val mutableShowNoInternetDialog = MutableLiveData<Boolean>()
3333
val showNoInternetDialog: LiveData<Boolean> = mutableShowNoInternetDialog
3434
private val mutableRequestTokenSuccess = MutableLiveData<Boolean>()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ class ProfileFragment : Fragment(), BottomIconDoubleClick {
118118
.nonNull()
119119
.observe(viewLifecycleOwner, Observer {
120120
rootView.snackbar(it)
121-
profileViewModel.mutableMessage.postValue(null)
122121
})
123122

124123
profileViewModel.accountDeleted

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ import io.reactivex.rxkotlin.plusAssign
99
import org.fossasia.openevent.general.utils.extensions.withDefaultSchedulers
1010
import org.fossasia.openevent.general.common.SingleLiveEvent
1111
import org.fossasia.openevent.general.data.Resource
12-
import org.fossasia.openevent.general.event.EventService
1312
import timber.log.Timber
1413

1514
class ProfileViewModel(
1615
private val authService: AuthService,
17-
private val resource: Resource,
18-
private val eventService: EventService
16+
private val resource: Resource
1917
) : ViewModel() {
2018

2119
private val compositeDisposable = CompositeDisposable()
@@ -24,8 +22,8 @@ class ProfileViewModel(
2422
val progress: LiveData<Boolean> = mutableProgress
2523
private val mutableUser = MutableLiveData<User>()
2624
val user: LiveData<User> = mutableUser
27-
val mutableMessage = SingleLiveEvent<String>()
28-
val message: LiveData<String> = mutableMessage
25+
private val mutableMessage = SingleLiveEvent<String>()
26+
val message: SingleLiveEvent<String> = mutableMessage
2927
private val mutableUpdatedUser = MutableLiveData<User>()
3028
val updatedUser: LiveData<User> = mutableUpdatedUser
3129
private val mutableUpdatedPassword = MutableLiveData<String>()
@@ -67,13 +65,13 @@ class ProfileViewModel(
6765
.withDefaultSchedulers()
6866
.subscribe({
6967
if (it.passwordChanged) {
70-
mutableMessage.value = "Password changed successfully!"
68+
mutableMessage.value = resource.getString(R.string.change_password_success_message)
7169
mutableUpdatedPassword.value = newPassword
7270
}
7371
}, {
7472
if (it.message.toString() == "HTTP 400 BAD REQUEST")
75-
mutableMessage.value = "Incorrect Old Password provided!"
76-
else mutableMessage.value = "Unable to change password!"
73+
mutableMessage.value = resource.getString(R.string.incorrect_old_password_message)
74+
else mutableMessage.value = resource.getString(R.string.change_password_fail_message)
7775
})
7876
}
7977

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ class SignUpViewModel(
2424
private val mutableProgress = MutableLiveData<Boolean>()
2525
val progress: LiveData<Boolean> = mutableProgress
2626
private val mutableError = SingleLiveEvent<String>()
27-
val error: LiveData<String> = mutableError
27+
val error: SingleLiveEvent<String> = mutableError
2828
private val mutableShowNoInternetDialog = MutableLiveData<Boolean>()
2929
val showNoInternetDialog: LiveData<Boolean> = mutableShowNoInternetDialog
3030
private val mutableLoggedIn = SingleLiveEvent<Boolean>()
31-
var loggedIn: LiveData<Boolean> = mutableLoggedIn
31+
var loggedIn: SingleLiveEvent<Boolean> = mutableLoggedIn
3232

3333
var email: String? = null
3434
var password: String? = null

0 commit comments

Comments
 (0)