Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Marking location not required fixed #63

Merged
merged 2 commits into from
Nov 16, 2021
Merged

Marking location not required fixed #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bc79e4
Bug fix: marking location not required fixed
philips77 Nov 16, 2021
ef593ae
Information text fixed
philips77 Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/java/no/nordicsemi/android/blinky/viewmodels/ScannerViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ public void onBatchScanResults(@NonNull final List<ScanResult> results) {
// This callback will be called only if the report delay set above is greater then 0.

// If the packet has been obtained while Location was disabled, mark Location as not required
if (Utils.isLocationRequired(getApplication()) && !Utils.isLocationEnabled(getApplication()))
if (!results.isEmpty()
&& Utils.isLocationRequired(getApplication())
&& !Utils.isLocationEnabled(getApplication()))
Utils.markLocationNotRequired(getApplication());

boolean atLeastOneMatchedFilter = false;
Expand Down
21 changes: 10 additions & 11 deletions app/src/main/res/values/strings_scanner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<string name="unknown_device">Unknown Device</string>

<string name="location_permission_title">LOCATION PERMISSION REQUIRED</string>
<string name="location_permission_info">From Android 6.0 Marshmallow until Android 11 the application
<string name="location_permission_info">From Android 6.0 until 11 the application
requires Location permission in order to scan for Bluetooth Low Energy devices. This
is because Bluetooth LE beacons, for example iBeacons or Eddystone, may be used to
determine the phone\'s and user\'s location.\n\n<b>nRF Connect Device Manager</b> will not use
determine the phone\'s and user\'s location.\n\n<b>nRF Blinky</b> will not use
this information in any way.\n\nOn Android 12 and above, a new Bluetooth Scan permission
could be requested with a flag that disables scanning for location, but on this system
version no scan results are returned without location enabled.</string>
is requested with a flag that prevents using scanning for estimating location, but on this system
version, unfortunately, no scan results are returned without location enabled.</string>

<string name="bluetooth_permission_title">BLUETOOTH PERMISSIONS REQUIRED</string>
<string name="bluetooth_permission_info">The app needs to scan and connect to\nBluetooth LE devices.</string>
Expand All @@ -27,11 +27,10 @@
below to enable it.</string>

<string name="blinky_guide_title">CAN\'T SEE YOUR BLINKY?</string>
<string name="blinky_guide_info">1. Make sure the DK is <b>turned on</b> and is connected to
a power source using a micro USB cable or a coin cell is plugged in.\n\n2. Make sure the
<b>ble_app_blinky</b> firmware and SoftDevice are flashed.</string>
<string name="blinky_guide_location_info">3. Location is turned off. Most Android phones
require it in order to scan for Bluetooth LE devices. If you are sure your
device is advertising and it doesn\'t show up here, click the button below to
enable Location.</string>
<string name="blinky_guide_info">1. <b>Turn on</b> the device and is connect to
a power source using a micro USB cable or a coin cell is plugged in.\n\n2. Make sure
the application advertises LED Button Service (LBS), or change the filter in the menu.</string>
<string name="blinky_guide_location_info">3. Location is turned off.\n\nLocation service is required
in order to scan for Bluetooth LE devices. If you are sure your device is advertising and
it doesn\'t show up here, click the button below to enable Location.</string>
</resources>