From bd98b2e3e801cebcd90f90af972c8a4fd2db49bd Mon Sep 17 00:00:00 2001
From: Pulkit Bhatia <pulkit4tech@gmail.com>
Date: Tue, 3 Jan 2017 13:42:51 +0530
Subject: [PATCH] #10 : Added permission request on go

---
 app/src/main/AndroidManifest.xml              |   1 +
 app/src/main/java/com/pulkit4tech/.DS_Store   | Bin 0 -> 6148 bytes
 .../main/java/com/pulkit4tech/privy/.DS_Store | Bin 0 -> 6148 bytes
 .../com/pulkit4tech/privy/MainActivity.java   |   2 -
 .../pulkit4tech/privy/PrivyMapsActivity.java  |  51 +++++++++++-------
 .../privy/constants/Constants.java            |   7 +++
 .../LocationServices.java                     |   4 +-
 7 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/com/pulkit4tech/.DS_Store
 create mode 100644 app/src/main/java/com/pulkit4tech/privy/.DS_Store
 create mode 100644 app/src/main/java/com/pulkit4tech/privy/constants/Constants.java
 rename app/src/main/java/com/pulkit4tech/privy/{Utilities => utilities}/LocationServices.java (93%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 41651e2..26698e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
          location permissions for the 'MyLocation' functionality. 
     -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/pulkit4tech/.DS_Store b/app/src/main/java/com/pulkit4tech/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a8313a1e53abff332b86725e9bb78c54041a2d5c
GIT binary patch
literal 6148
zcmeHK%}T>S5Z>*NCWx4WV2^w8)<bKnJqe-KgEt|f2bDIV#Rg(h+O(y{NM1wV$S3f1
zoY~!$mMVA>u`@9H&Cbs3vR}f^E@O;0$K5Jp7Gul+Ma-Gdd?7fFx+Xd8LF96dnKvB`
zydd({V#)D08NhE>WCJ#2KAW)R@AvKv0)G@&Djz(TFBG@74bwEtUE|*AM^h(u<MF8J
z4sT`8@Af=xUqw-{uwC!k?@im*{#g{pt{?V>OW}7ne%Ots&1f8UM{=G^H||5OT&Qi8
zlB8BUE{j_IC@qVm(WsO~y>^nOhH-FMJ-z5W&YqIz^yO7C%i$N4vZrwlZ(uBKapDZa
zAPOJAJI|O$5)uQ%05Py34Cv#}*x8W%(l&_!V&LZt;Q1gx5p9i`LV0vRgV#qKFCe0T
zjc*A=q0!cuDTEOau2KP2D%Vd8uF}CTbeyd*Q>fAzmn*|OdS$L(C|s@%ej&pdw-r)L
z3=jjW4CGbU!uo&y{ri74iF(8UG4QV#;DwgcYQmOuZC%?O)>;AD0Y$;MOyMF03|WdH
f7E5snR0{Y78i2OOOd)tc=prC#poSRuRR%r*TS-xN

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/pulkit4tech/privy/.DS_Store b/app/src/main/java/com/pulkit4tech/privy/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c7d606910dc1e438c0a0ec5dce3f590dae9e78d7
GIT binary patch
literal 6148
zcmeHKJ8Hu~5S_7A*raipa<7mZEJ8VfE|9_@1dIZ<<yuwFm80d&hY%yB3AizDVCL=4
z&Rd~ZXfz_C?YMsu*@?&oZYZA?=4R*SGh1awfpFaME@$|woG$&WdO2a-t&Gk){N^8r
z!^iLzH!o9}r2<rd3Qz$mKn4Dxfc0M3<{^-g3Qz$m@S}iz9}3*CCQgC==|J!i0N5by
zhPBTUz+wqtO`HOefoV{ILDd{FH0a2etgDGrV9-T#_|SZ^=7ggDblhLOT(kx<QUNM(
zt-w0AJL~_?@IU7NYZ7-<fC}7|0@`$a*W#73x6WS9dToKfz^&#BZicl}5WF1&y&Yp?
f?fB7)qORB)=QVK(bUN}*2l8jYbfHm!TPyGlBb61j

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
index a0bddf2..ac9cfad 100644
--- a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
+++ b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
@@ -6,8 +6,6 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    public static final String DEBUG = "DEBUGGER";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java b/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java
index f395be5..27b186b 100644
--- a/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java
+++ b/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java
@@ -1,8 +1,10 @@
 package com.pulkit4tech.privy;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
@@ -18,10 +20,12 @@
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
-import com.pulkit4tech.privy.Utilities.LocationServices;
 import com.pulkit4tech.privy.data.LocationData;
+import com.pulkit4tech.privy.utilities.LocationServices;
 
-import static com.pulkit4tech.privy.MainActivity.DEBUG;
+import static com.pulkit4tech.privy.constants.Constants.DEBUG;
+import static com.pulkit4tech.privy.constants.Constants.CAMERA_ANIMATION_DURATION;
+import static com.pulkit4tech.privy.constants.Constants.MY_PERMISSIONS_REQUEST_FINE_LOCATIONS;
 
 public class PrivyMapsActivity extends ActionBarActivity implements OnMapReadyCallback {
 
@@ -29,7 +33,6 @@ public class PrivyMapsActivity extends ActionBarActivity implements OnMapReadyCa
     private Context mContext;
     private Marker myLocationMarker;
     private CameraPosition MY_LOCATION_CAMERA_POS;
-    private static final int CAMERA_ANIMATION_DURATION = 2500;
 
     // My Location
     private LocationData myLocationData;
@@ -79,12 +82,17 @@ private void addMarkers() {
 
     private void setUpMapInfo() {
 
-        if(!checkLocationEnabledPermission())
-            return;
+        if(!checkLocationEnabledPermission()){
+            ActivityCompat.requestPermissions(this,new String[]{Manifest.permission.ACCESS_FINE_LOCATION},MY_PERMISSIONS_REQUEST_FINE_LOCATIONS);
+        }else {
+            setUpMyLocationMarker();
+        }
 
+    }
 
+    private void setUpMyLocationMarker() {
+        mMap.setMyLocationEnabled(true);
         getMyCurrentLocation();
-
     }
 
     private void getMyCurrentLocation(){
@@ -137,18 +145,25 @@ private void changeCamera(CameraUpdate update, GoogleMap.CancelableCallback call
     }
 
     private boolean checkLocationEnabledPermission() {
-        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            // TODO: Consider calling
-            //    ActivityCompat#requestPermissions
-            // here to request the missing permissions, and then overriding
-            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-            //                                          int[] grantResults)
-            // to handle the case where the user grants the permission. See the documentation
-            // for ActivityCompat#requestPermissions for more details.
-
-            return false;
+        return ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        switch (requestCode){
+            case MY_PERMISSIONS_REQUEST_FINE_LOCATIONS:
+                if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED){
+                    setUpMyLocationMarker();
+                }
+                else {
+                    Toast.makeText(mContext,"Please give permission for location",Toast.LENGTH_SHORT).show();
+                }
+            break;
+
+            default:
+                Log.d(DEBUG,"Some other request code: " + requestCode);
         }
-        mMap.setMyLocationEnabled(true);
-        return true;
     }
 }
diff --git a/app/src/main/java/com/pulkit4tech/privy/constants/Constants.java b/app/src/main/java/com/pulkit4tech/privy/constants/Constants.java
new file mode 100644
index 0000000..b8e8bb5
--- /dev/null
+++ b/app/src/main/java/com/pulkit4tech/privy/constants/Constants.java
@@ -0,0 +1,7 @@
+package com.pulkit4tech.privy.constants;
+
+public class Constants {
+    public static final String DEBUG = "DEBUGGER";
+    public static final int CAMERA_ANIMATION_DURATION = 2500;
+    public static final int MY_PERMISSIONS_REQUEST_FINE_LOCATIONS = 1;
+}
diff --git a/app/src/main/java/com/pulkit4tech/privy/Utilities/LocationServices.java b/app/src/main/java/com/pulkit4tech/privy/utilities/LocationServices.java
similarity index 93%
rename from app/src/main/java/com/pulkit4tech/privy/Utilities/LocationServices.java
rename to app/src/main/java/com/pulkit4tech/privy/utilities/LocationServices.java
index dba4237..314790e 100644
--- a/app/src/main/java/com/pulkit4tech/privy/Utilities/LocationServices.java
+++ b/app/src/main/java/com/pulkit4tech/privy/utilities/LocationServices.java
@@ -1,4 +1,4 @@
-package com.pulkit4tech.privy.Utilities;
+package com.pulkit4tech.privy.utilities;
 
 import android.Manifest;
 import android.content.Context;
@@ -36,7 +36,7 @@ public LocationData getCurrentLocation() {
         criteria.setCostAllowed(true);
         criteria.setPowerRequirement(Criteria.POWER_MEDIUM);
         String bestProvider = locationManager.getBestProvider(criteria, true);
-        if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+        if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             // TODO: Consider calling
             //    ActivityCompat#requestPermissions
             // here to request the missing permissions, and then overriding