dinislage/Bluetooth-LE-Library-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App no longer tries to ask for COARSE_LOCATION permission pre API 23 as it is not needed

Browse Source
This commit is contained in:
Alexandros Schillings
2017-02-03 12:09:20 +00:00
parent f2f9ac38f4
commit ebc44c7537
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sample_app/src/main/java/uk/co/alt236/btlescan/ui/main/MainActivity.java
View File

@@ -3,6 +3,7 @@ package uk.co.alt236.btlescan.ui.main;
import android.Manifest;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
@@ -119,22 +120,7 @@ public class MainActivity extends AppCompatActivity {
public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_scan:
PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(this,
new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, new PermissionsResultAction() {
@Override
public void onGranted() {
startScan();
}
@Override
public void onDenied(String permission) {
Toast.makeText(MainActivity.this,
R.string.permission_not_granted_coarse_location,
Toast.LENGTH_SHORT)
.show();
}
});
startScanPrepare();
break;
case R.id.menu_stop:
mScanner.scanLeDevice(-1, false);
@@ -174,9 +160,36 @@ public class MainActivity extends AppCompatActivity {
invalidateOptionsMenu();
}
private void startScanPrepare() {
//
// The COARSE_LOCATION permission is only needed after API 23 to do a BTLE scan
//
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(this,
new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, new PermissionsResultAction() {
@Override
public void onGranted() {
startScan();
}
@Override
public void onDenied(String permission) {
Toast.makeText(MainActivity.this,
R.string.permission_not_granted_coarse_location,
Toast.LENGTH_SHORT)
.show();
}
});
} else {
startScan();
}
}
private void startScan() {
final boolean mIsBluetoothOn = mBluetoothUtils.isBluetoothOn();
final boolean mIsBluetoothLePresent = mBluetoothUtils.isBluetoothLeSupported();
final boolean isBluetoothOn = mBluetoothUtils.isBluetoothOn();
final boolean isBluetoothLePresent = mBluetoothUtils.isBluetoothLeSupported();
mDeviceStore.clear();
updateItemCount(0);
@@ -184,7 +197,7 @@ public class MainActivity extends AppCompatActivity {
mList.setAdapter(mRecyclerAdapter);
mBluetoothUtils.askUserToEnableBluetoothIfNeeded();
if (mIsBluetoothOn && mIsBluetoothLePresent) {
if (isBluetoothOn && isBluetoothLePresent) {
mScanner.scanLeDevice(-1, true);
invalidateOptionsMenu();
}