Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Report Bluetooth LE and Wi-Fi Direct support.

Browse Source
This commit is contained in:
akwizgran
2017-08-16 12:21:13 +01:00
parent 078534889e
commit eb9d0c00a8
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
View File

@@ -33,6 +33,7 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE; import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
import static android.content.Context.ACTIVITY_SERVICE; import static android.content.Context.ACTIVITY_SERVICE;
import static android.content.Context.CONNECTIVITY_SERVICE; import static android.content.Context.CONNECTIVITY_SERVICE;
import static android.content.Context.WIFI_P2P_SERVICE;
import static android.content.Context.WIFI_SERVICE; import static android.content.Context.WIFI_SERVICE;
import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
@@ -162,6 +163,12 @@ public class BriarReportPrimer implements ReportPrimer {
else wifiStatus += "not connected"; else wifiStatus += "not connected";
customData.put("Wi-Fi status", wifiStatus); customData.put("Wi-Fi status", wifiStatus);
// Is wifi direct supported?
String wifiDirectStatus = "Supported";
if (ctx.getSystemService(WIFI_P2P_SERVICE) == null)
wifiDirectStatus = "Not supported";
customData.put("Wi-Fi Direct", wifiDirectStatus);
if (wm != null) { if (wm != null) {
WifiInfo wifiInfo = wm.getConnectionInfo(); WifiInfo wifiInfo = wm.getConnectionInfo();
if (wifiInfo != null) { if (wifiInfo != null) {
@@ -189,6 +196,13 @@ public class BriarReportPrimer implements ReportPrimer {
// Is Bluetooth discoverable? // Is Bluetooth discoverable?
boolean btDiscoverable = bt != null && boolean btDiscoverable = bt != null &&
bt.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE; bt.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE;
// Is Bluetooth LE scanning and advertising supported?
boolean btLeApi = false, btLeScan = false, btLeAdvertise = false;
if (bt != null && Build.VERSION.SDK_INT >= 21) {
btLeApi = true;
btLeScan = bt.getBluetoothLeScanner() != null;
btLeAdvertise = bt.getBluetoothLeAdvertiser() != null;
}
String btStatus; String btStatus;
if (btAvailable) btStatus = "Available, "; if (btAvailable) btStatus = "Available, ";
@@ -200,6 +214,14 @@ public class BriarReportPrimer implements ReportPrimer {
if (btDiscoverable) btStatus += "discoverable"; if (btDiscoverable) btStatus += "discoverable";
else btStatus += "not discoverable"; else btStatus += "not discoverable";
customData.put("Bluetooth status", btStatus); customData.put("Bluetooth status", btStatus);
if (btLeApi) {
String btLeStatus;
if (btLeScan) btLeStatus = "Scanning, ";
else btLeStatus = "No scanning, ";
if (btLeAdvertise) btLeStatus += "advertising";
else btLeStatus += "no advertising";
customData.put("Bluetooth LE status", btLeStatus);
}
if (bt != null) if (bt != null)
customData.put("Bluetooth address", customData.put("Bluetooth address",