diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java index d7bb36031..1efef7aa8 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java @@ -156,21 +156,25 @@ public class ReviewController { .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe((result) -> { - String message; - String title; - if (result) { - title = context.getString(R.string.send_thank_success_title); - message = context.getString(R.string.send_thank_success_message, media.getDisplayTitle()); - } else { - title = context.getString(R.string.send_thank_failure_title); - message = context.getString(R.string.send_thank_failure_message, media.getDisplayTitle()); - } - - showNotification(title, message); - + displayThanksToast(context,result); }, Timber::e); } + @SuppressLint("StringFormatInvalid") + private void displayThanksToast(final Context context, final boolean result){ + final String message; + final String title; + if (result) { + title = context.getString(R.string.send_thank_success_title); + message = context.getString(R.string.send_thank_success_message, media.getDisplayTitle()); + } else { + title = context.getString(R.string.send_thank_failure_title); + message = context.getString(R.string.send_thank_failure_message, media.getDisplayTitle()); + } + + ViewUtil.showShortToast(context,message); + } + private void showNotification(String title, String message) { notificationBuilder.setDefaults(NotificationCompat.DEFAULT_ALL) .setContentTitle(title) diff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt index 9c89eaeeb..684ad15fd 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt @@ -144,8 +144,23 @@ class ReviewControllerTest { R.string.send_thank_toast, media.displayTitle ) ) + + val method: Method = ReviewController::class.java.getDeclaredMethod( + "displayThanksToast", Context::class.java, Boolean::class.java + ) + + method.isAccessible = true + method.invoke(controller,context,true) + + assertEquals( + ShadowToast.getTextOfLatestToast().toString(), + context.getString( + R.string.send_thank_success_message, media.displayTitle + ) + ) } + @Test fun testSendThanksCaseNull() { shadowOf(Looper.getMainLooper()).idle()