Skip to content

Commit 272ca53

Browse files
committed
removed protected permission
1 parent 26e8579 commit 272ca53

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

app/src/debug/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
1212

1313
<!-- Allows changing locales -->
14-
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
14+
<!-- <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>-->
1515

1616
</manifest>

app/src/main/java/net/sylvek/itracing2/receivers/CapturePosition.java

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package net.sylvek.itracing2.receivers;
22

3+
import android.Manifest;
34
import android.app.Notification;
45
import android.app.NotificationManager;
56
import android.app.PendingIntent;
67
import android.content.BroadcastReceiver;
78
import android.content.Context;
89
import android.content.Intent;
10+
import android.content.pm.PackageManager;
911
import android.location.Criteria;
1012
import android.location.Location;
1113
import android.location.LocationManager;
1214
import android.net.Uri;
15+
import android.support.v4.app.ActivityCompat;
16+
1317
import net.sylvek.itracing2.R;
1418
import net.sylvek.itracing2.database.Devices;
1519
import net.sylvek.itracing2.database.Events;
@@ -27,12 +31,22 @@ public class CapturePosition extends BroadcastReceiver {
2731
public static final String NAME = "position";
2832

2933
@Override
30-
public void onReceive(Context context, Intent intent)
31-
{
34+
public void onReceive(Context context, Intent intent) {
3235
// because some customers don't like Google Play Services…
3336
Location bestLocation = null;
3437
final LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
38+
assert locationManager != null;
3539
for (final String provider : locationManager.getAllProviders()) {
40+
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
41+
// TODO: Consider calling
42+
// ActivityCompat#requestPermissions
43+
// here to request the missing permissions, and then overriding
44+
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
45+
// int[] grantResults)
46+
// to handle the case where the user grants the permission. See the documentation
47+
// for ActivityCompat#requestPermissions for more details.
48+
return;
49+
}
3650
final Location location = locationManager.getLastKnownLocation(provider);
3751
final long now = System.currentTimeMillis();
3852
if (location != null
@@ -59,6 +73,7 @@ public void onReceive(Context context, Intent intent)
5973
.setAutoCancel(false)
6074
.setContentIntent(PendingIntent.getActivity(context, 0, mapIntent, PendingIntent.FLAG_UPDATE_CURRENT))
6175
.build();
76+
assert notificationManager != null;
6277
notificationManager.notify(NOTIFICATION_ID, notification);
6378

6479
final String address = intent.getStringExtra(Devices.ADDRESS);

build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.0.0'
9+
classpath 'com.android.tools.build:gradle:4.0.1'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Oct 10 21:16:51 CEST 2016
1+
#Thu Sep 17 16:35:14 CEST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

0 commit comments

Comments
 (0)