From 0b965aa5e897558699a8ced5d726b07d9833e8ff Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Fri, 14 Sep 2018 12:24:08 +0300
Subject: [PATCH] Inject location manager to activity instead

---
 .../contributions/ContributionsActivity.java       |  3 +++
 .../contributions/ContributionsFragment.java       | 14 ++++++--------
 .../commons/nearby/NearbyNoificationCardView.java  |  5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index ca43e5b58..26bb7f4b1 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -22,6 +22,7 @@ import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.AuthenticatedActivity;
 import fr.free.nrw.commons.auth.SessionManager;
+import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.nearby.NearbyFragment;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
@@ -37,6 +38,8 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
     TabLayout tabLayout;
     @BindView(R.id.pager)
     ViewPager viewPager;
+    @Inject
+    public LocationServiceManager locationManager;
 
 
     public Intent uploadServiceIntent;
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 165112851..cc5fc57ec 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
@@ -85,8 +85,6 @@ public class ContributionsFragment
     MediaWikiApi mediaWikiApi;
     @Inject
     NotificationController notificationController;
-    @Inject
-    public LocationServiceManager locationManager;
 
     private ArrayList<DataSetObserver> observersWaitingForLoad = new ArrayList<>();
     private Cursor allContributions;
@@ -288,8 +286,8 @@ public class ContributionsFragment
                     // No need to display permission request button anymore
                     nearbyNoificationCardView.displayPermissionRequestButton(false);
                 } else {
-                    // No need to display permission request button anymore
-                    nearbyNoificationCardView.displayPermissionRequestButton(false);
+                    // Still ask for permission
+                    nearbyNoificationCardView.displayPermissionRequestButton(true);
                 }
             }
             break;
@@ -444,15 +442,15 @@ public class ContributionsFragment
     @Override
     public void onStart() {
         super.onStart();
-        locationManager.addLocationListener(this);
+        ((ContributionsActivity)getActivity()).locationManager.addLocationListener(this);
 
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        locationManager.removeLocationListener(this);
-        locationManager.unregisterLocationManager();
+        ((ContributionsActivity)getActivity()).locationManager.removeLocationListener(this);
+        ((ContributionsActivity)getActivity()).locationManager.unregisterLocationManager();
     }
 
     @Override
@@ -475,7 +473,7 @@ public class ContributionsFragment
 
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (locationManager.isLocationPermissionGranted()) {
+            if (((ContributionsActivity)getActivity()).locationManager.isLocationPermissionGranted()) {
                 // Display nearest location, first listen
                 nearbyNoificationCardView.displayPermissionRequestButton(false);
 
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java
index e89b4df73..1d85ada0c 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java
@@ -74,8 +74,7 @@ public class NearbyNoificationCardView  extends CardView{
             @Override
             public void onClick(View view) {
                 if (!((ContributionsActivity)context).isFinishing()) {
-                    // TODO: why location manager is null
-                    ((ContributionsActivity) context).contributionsFragment.locationManager.requestPermissions((ContributionsActivity) context);
+                    ((ContributionsActivity) context).locationManager.requestPermissions((ContributionsActivity) context);
                 }
             }
         });
@@ -83,9 +82,11 @@ public class NearbyNoificationCardView  extends CardView{
 
     public void displayPermissionRequestButton(boolean isPermissionRequestButtonNeeded) {
         if (isPermissionRequestButtonNeeded) {
+            Log.d("deneme","called1");
             contentLayout.setVisibility(GONE);
             permissionRequestButton.setVisibility(VISIBLE);
         } else {
+            Log.d("deneme","called2");
             contentLayout.setVisibility(VISIBLE);
             permissionRequestButton.setVisibility(GONE);
         }