Skip to content

Improve alert presentation and prevent blank toast messages #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iHateErrorsSoMuch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve alert presentation and prevent blank toast messages #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/src/main/java/deakin/gopher/guardian/view/general/AddNewPatientActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ class AddNewPatientActivity : BaseActivity() {

if (response.isSuccessful) {
if (response.body()?.patient != null) {
showMessage(response.message())
showMessage("Patient added successfully")
onBackPressedDispatcher.onBackPressed()
} else {
showMessage(response.body()?.apiError ?: "Failed to add patient")
Expand All @@ -321,7 +321,12 @@ class AddNewPatientActivity : BaseActivity() {
response.errorBody()?.string(),
ApiErrorResponse::class.java,
)
showMessage(errorResponse.apiError ?: response.message())
showMessage(
if (errorResponse.apiError.isNullOrBlank())
"Something went wrong while adding the patient"
else
errorResponse.apiError
)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class PinCodeActivity : AppCompatActivity() {
) {
progressBar.hide()
if (response.isSuccessful && response.body() != null) {
showMessage(response.body()!!.apiMessage ?: "Pin sent tou your email")
showMessage(response.body()!!.apiMessage ?: "Pin sent to your email")
} else {
// Handle error
val errorResponse =
Expand Down
Loading