From d81caf6a4270e918528a3f0c0aa63a52f2dcb6d0 Mon Sep 17 00:00:00 2001
From: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com>
Date: Mon, 22 Feb 2021 15:30:28 +0530
Subject: [PATCH] Fixes #4218 - In-App notifications appear on media detail
 fragment (#4246)

* Fixed issue with In-App Notification appearing on media detail view.

* Added a comment

* fixed style issues

Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com>
---
 .../contributions/ContributionsFragment.java  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
index e61a6e97b..bb950daf8 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -431,19 +431,22 @@ public class ContributionsFragment
             showNearbyCardPermissionRationale();
         });
 
-        if (store.getBoolean("displayNearbyCardView", true)) {
-            checkPermissionsAndShowNearbyCardView();
-            if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
-                nearbyNotificationCardView.setVisibility(View.VISIBLE);
+        // Notification cards should only be seen on contributions list, not in media details
+        if (mediaDetailPagerFragment == null) {
+            if (store.getBoolean("displayNearbyCardView", true)) {
+                checkPermissionsAndShowNearbyCardView();
+                if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
+                    nearbyNotificationCardView.setVisibility(View.VISIBLE);
+                }
+
+            } else {
+                // Hide nearby notification card view if related shared preferences is false
+                nearbyNotificationCardView.setVisibility(View.GONE);
             }
 
-        } else {
-            // Hide nearby notification card view if related shared preferences is false
-            nearbyNotificationCardView.setVisibility(View.GONE);
+            setNotificationCount();
+            fetchCampaigns();
         }
-
-        setNotificationCount();
-        fetchCampaigns();
     }
 
     private void checkPermissionsAndShowNearbyCardView() {