Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit fd7a6ae

Browse files
committed
Merge branch 'Development'
2 parents 11874ba + eb2ab8e commit fd7a6ae

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

app/src/main/java/com/example/campusaccesible/MainActivity.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
import androidx.appcompat.app.ActionBar;
55
import androidx.appcompat.app.AppCompatActivity;
66
import androidx.appcompat.widget.Toolbar;
7+
import androidx.core.app.ActivityCompat;
78
import androidx.fragment.app.Fragment;
89

10+
import android.Manifest;
11+
import android.content.pm.PackageManager;
912
import android.os.Bundle;
1013
import android.util.Log;
1114
import android.view.Menu;
@@ -50,6 +53,8 @@ protected void onCreate(Bundle savedInstanceState) {
5053

5154
getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
5255
getSupportActionBar().setCustomView(R.layout.action_bar_layout);
56+
57+
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 44);
5358
}
5459

5560
// -----------------------------------------------------
@@ -99,4 +104,13 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
99104
return false;
100105
}
101106
};
107+
108+
@Override
109+
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
110+
if (requestCode == 44) {
111+
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
112+
// When permission granted call method
113+
}
114+
}
115+
}
102116
}

app/src/main/java/com/example/campusaccesible/MapFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
238238
});
239239
} else {
240240
// When permission denied request permission
241-
ActivityCompat.requestPermissions(MapFragment.this.getActivity(), new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 44);
241+
//ActivityCompat.requestPermissions(MapFragment.this.getActivity(), new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 44);
242242

243243
@SuppressLint("MissingPermission") Task<Location> task = client.getLastLocation();
244244
task.addOnSuccessListener(new OnSuccessListener<Location>() {
@@ -270,15 +270,15 @@ public void getRoute() {
270270
}
271271
}
272272

273-
@SuppressLint("MissingPermission")
273+
/*@SuppressLint("MissingPermission")
274274
@Override
275275
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
276276
if (requestCode == 44) {
277277
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
278278
// When permission granted call method
279279
}
280280
}
281-
}
281+
}*/
282282

283283
private String getUrl(LatLng origin, LatLng dest, String directionMode) {
284284
// Origin of route

0 commit comments

Comments
 (0)