Fixed commons-app#4906 : Peer review: "thank the contributor" should show snackb… (commons-app#4914)

arinmodi · web-flow · commit 1ae013d2b321 · 2022-04-25T22:48:43.000+03:00
* Fixed commons-app#4906 : Peer review: "thank the contributor" should show snackbar instead of notification * changes the snackbar to toast * added the tests * minor changes * minor changes - 2
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
@@ -156,19 +156,23 @@ void sendThanks(@NonNull Activity activity) {
                 .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());
-                    }
+                    displayThanksToast(context,result);
+                }, Timber::e);
+    }
 
-                    showNotification(title, message);
+    @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());
+        }
 
-                }, Timber::e);
+        ViewUtil.showShortToast(context,message);
     }
 
     private void showNotification(String title, String message) {
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
@@ -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()
