gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Having trouble with Bluetooth permissions - made a few changes and it seems to be working again, but needs testing on a couple of devices

Browse Source
This commit is contained in:
Graham Jones
2024-04-12 19:25:59 +01:00
parent 0dbb735517
commit a82a71f413
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java
View File

@@ -70,10 +70,11 @@ public class BLEScanActivity extends ListActivity {
private final String TAG = "BLEScanActivity"; private final String TAG = "BLEScanActivity";
private final String[] REQUIRED_PERMISSIONS = { private final String[] REQUIRED_PERMISSIONS = {
Manifest.permission.ACCESS_FINE_LOCATION, //Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.ACCESS_COARSE_LOCATION, //Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.BLUETOOTH, //Manifest.permission.BLUETOOTH,
Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.BLUETOOTH_ADMIN,
Manifest.permission.BLUETOOTH_SCAN,
//Manifest.permission.BLUETOOTH_PRIVILEGED, //Manifest.permission.BLUETOOTH_PRIVILEGED,
}; };
@@ -92,6 +93,7 @@ public class BLEScanActivity extends ListActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Log.i(TAG,"onCreate()");
setContentView(R.layout.ble_scan_activity); setContentView(R.layout.ble_scan_activity);
//this.getActionBar().setTitle(R.string.title_devices); //this.getActionBar().setTitle(R.string.title_devices);
this.setTitle(R.string.title_devices); this.setTitle(R.string.title_devices);
@@ -120,6 +122,8 @@ public class BLEScanActivity extends ListActivity {
} }
mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner(); mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
mPermissionsRequested = false;
} }
@Override @Override
@@ -160,6 +164,7 @@ public class BLEScanActivity extends ListActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
Log.i(TAG,"onResume()");
SharedPreferences SP = PreferenceManager SharedPreferences SP = PreferenceManager
.getDefaultSharedPreferences(this); .getDefaultSharedPreferences(this);
TextView tv = (TextView) findViewById(R.id.current_ble_device_tv); TextView tv = (TextView) findViewById(R.id.current_ble_device_tv);
@@ -200,8 +205,10 @@ public class BLEScanActivity extends ListActivity {
tv.setBackgroundColor(okColour); tv.setBackgroundColor(okColour);
} }
Log.i(TAG,"onResume - calling requestBTPermissions()");
requestBTPermissions(this); requestBTPermissions(this);
Log.i(TAG,"onResume - checking permissions");
boolean permissionsOk = true; boolean permissionsOk = true;
for (int i = 0; i < REQUIRED_PERMISSIONS.length; i++) { for (int i = 0; i < REQUIRED_PERMISSIONS.length; i++) {
if (ContextCompat.checkSelfPermission(this, REQUIRED_PERMISSIONS[i]) == PERMISSION_GRANTED) { if (ContextCompat.checkSelfPermission(this, REQUIRED_PERMISSIONS[i]) == PERMISSION_GRANTED) {
@@ -284,15 +291,18 @@ public class BLEScanActivity extends ListActivity {
public void requestBTPermissions(Activity activity) { public void requestBTPermissions(Activity activity) {
if (mPermissionsRequested) { if (mPermissionsRequested) {
Log.i(TAG, "requestPermissions() - request already sent - not doing anything"); Log.i(TAG, "requestBTPermissions() - request already sent - not doing anything");
} else { } else {
Log.i(TAG, "requestPermissions() - requesting permissions"); Log.i(TAG, "requestBTPermissions() - showing rationale (if necessary)");
for (int i = 0; i < REQUIRED_PERMISSIONS.length; i++) { for (int i = 0; i < REQUIRED_PERMISSIONS.length; i++) {
if (ActivityCompat.shouldShowRequestPermissionRationale(activity, if (ActivityCompat.shouldShowRequestPermissionRationale(activity,
REQUIRED_PERMISSIONS[i])) { REQUIRED_PERMISSIONS[i])) {
Log.i(TAG, "shouldShowRationale for permission" + REQUIRED_PERMISSIONS[i]); Log.i(TAG, "shouldShowRationale for permission" + REQUIRED_PERMISSIONS[i]);
Toast toast = Toast.makeText(this, "Please give us permission! ", Toast.LENGTH_SHORT);
toast.show();
} }
} }
Log.i(TAG, "requestBTPermissions() - requesting permissions");
ActivityCompat.requestPermissions(activity, ActivityCompat.requestPermissions(activity,
REQUIRED_PERMISSIONS, REQUIRED_PERMISSIONS,
42); 42);
@@ -306,7 +316,7 @@ public class BLEScanActivity extends ListActivity {
mBluetoothLeScanner.startScan(mLeScanCallback); mBluetoothLeScanner.startScan(mLeScanCallback);
} catch (SecurityException e) { } catch (SecurityException e) {
Log.e(TAG, "startScan - SecurityException while starting scan"); Log.e(TAG, "startScan - SecurityException while starting scan");
Toast toast = Toast.makeText(this, "ERROR Starting Scan - Security Exception", Toast.LENGTH_SHORT); Toast toast = Toast.makeText(this, "ERROR - Security Exception "+e.getMessage(), Toast.LENGTH_SHORT);
toast.show(); toast.show();
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG,"startScan - Exception while starting scan"); Log.e(TAG,"startScan - Exception while starting scan");

7
app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
View File

@@ -114,9 +114,10 @@ public class StartupActivity extends AppCompatActivity {
public final String[] BT_PERMISSIONS = { public final String[] BT_PERMISSIONS = {
Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.BLUETOOTH, Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.BLUETOOTH_SCAN, //Manifest.permission.BLUETOOTH,
Manifest.permission.BLUETOOTH_ADMIN, //Manifest.permission.BLUETOOTH_SCAN,
//Manifest.permission.BLUETOOTH_ADMIN,
Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.BLUETOOTH_CONNECT,
}; };
private boolean mBTPermissionsRequested = false; private boolean mBTPermissionsRequested = false;