Skip to content

Commit ce52abb

Browse files
martinworkmartinwork
committed
Pairing - remove ACCESS_BACKGROUND_LOCATION
1 parent 4ecc3b0 commit ce52abb

File tree

3 files changed

+30
-21
lines changed

3 files changed

+30
-21
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30"/>
3737
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30"/>
38-
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" android:maxSdkVersion="30"/>
38+
<!-- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" android:maxSdkVersion="30"/>-->
3939

4040
<!-- API 31 Needed only if your app looks for Bluetooth devices. -->
4141
<!-- Include "neverForLocation" only if you can strongly assert that

‎app/src/main/java/com/samsung/microbit/data/constants/PermissionCodes.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ private PermissionCodes() {
1717
public static final int BLUETOOTH_PERMISSIONS_REQUESTED_API28 = 0x10;
1818
public static final int BLUETOOTH_PERMISSIONS_REQUESTED_API29 = 0x11;
1919
public static final int BLUETOOTH_PERMISSIONS_REQUESTED_API30_FOREGROUND = 0x12;
20-
public static final int BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND = 0x13;
20+
// // REMOVE BACKGROUND
21+
// public static final int BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND = 0x13;
2122
public static final int BLUETOOTH_PERMISSIONS_REQUESTED_API31 = 0x14;
2223
public static final int BLUETOOTH_PERMISSIONS_REQUESTED_FLASHING_API31 = 0x15;
2324

‎app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,13 @@ private boolean havePermissionsLocationForeground() {
201201
return yes;
202202
}
203203

204-
private boolean havePermissionsLocationBackground() {
205-
boolean yes = true;
206-
if (!havePermission(Manifest.permission.ACCESS_BACKGROUND_LOCATION))
207-
yes = false;
208-
return yes;
209-
}
204+
// // REMOVE BACKGROUND
205+
// private boolean havePermissionsLocationBackground() {
206+
// boolean yes = true;
207+
// if (!havePermission(Manifest.permission.ACCESS_BACKGROUND_LOCATION))
208+
// yes = false;
209+
// return yes;
210+
// }
210211

211212
private boolean pairingNeedsLocationEnabled() {
212213
if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -233,8 +234,9 @@ private boolean havePermissionsPairing() {
233234
else if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
234235
if ( !havePermissionsLocationForeground())
235236
yes = false;
236-
if (!havePermissionsLocationBackground())
237-
yes = false;
237+
// // REMOVE BACKGROUND
238+
// if (!havePermissionsLocationBackground())
239+
// yes = false;
238240
}
239241
else {
240242
if ( !havePermissionsLocationForeground())
@@ -257,8 +259,10 @@ private void requestPermissionsPairing() {
257259
} else if ( Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
258260
String[] permissionsNeeded = {
259261
Manifest.permission.ACCESS_COARSE_LOCATION,
260-
Manifest.permission.ACCESS_FINE_LOCATION,
261-
Manifest.permission.ACCESS_BACKGROUND_LOCATION };
262+
Manifest.permission.ACCESS_FINE_LOCATION
263+
// // REMOVE BACKGROUND
264+
// , Manifest.permission.ACCESS_BACKGROUND_LOCATION
265+
};
262266
requestPermission(permissionsNeeded, PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API29);
263267
} else {
264268
String[] permissionsNeeded = {
@@ -268,12 +272,13 @@ private void requestPermissionsPairing() {
268272
}
269273
}
270274

271-
private void requestPermissionsPairingAPI30Background() {
272-
if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
273-
String[] permissionsNeeded = { Manifest.permission.ACCESS_BACKGROUND_LOCATION };
274-
requestPermission(permissionsNeeded, PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND);
275-
}
276-
}
275+
// // REMOVE BACKGROUND
276+
// private void requestPermissionsPairingAPI30Background() {
277+
// if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
278+
// String[] permissionsNeeded = { Manifest.permission.ACCESS_BACKGROUND_LOCATION };
279+
// requestPermission(permissionsNeeded, PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND);
280+
// }
281+
// }
277282

278283
public void requestPermissionsPairingResult(int requestCode,
279284
@NonNull String permissions[],
@@ -287,15 +292,17 @@ public void requestPermissionsPairingResult(int requestCode,
287292
switch(requestCode) {
288293
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_FOREGROUND: {
289294
if ( havePermissionsLocationForeground()) {
290-
requestPermissionsPairingAPI30Background();
295+
// // REMOVE BACKGROUND
296+
// requestPermissionsPairingAPI30Background();
291297
} else {
292298
popupPermissionLocationError();
293299
}
294300
break;
295301
}
296302
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API28:
297303
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API29:
298-
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND:
304+
// // REMOVE BACKGROUND
305+
// case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND:
299306
popupPermissionLocationError();;
300307
break;
301308
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API31: {
@@ -1171,7 +1178,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String permissi
11711178
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API28:
11721179
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API29:
11731180
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_FOREGROUND:
1174-
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND:
1181+
// // REMOVE BACKGROUND
1182+
// case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API30_BACKGROUND:
11751183
case PermissionCodes.BLUETOOTH_PERMISSIONS_REQUESTED_API31: {
11761184
requestPermissionsPairingResult(requestCode, permissions, grantResults);
11771185
break;

0 commit comments

Comments
 (0)