From 7e020454bfb7edb6b8d6161d7c17bf80bc6c6c69 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 21 Jan 2016 16:14:21 +0000
Subject: [PATCH] Show Bluetooth address from Settings.Secure.
---
.../src/org/briarproject/android/CrashReportActivity.java | 8 ++++++++
.../src/org/briarproject/android/TestingActivity.java | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/briar-android/src/org/briarproject/android/CrashReportActivity.java b/briar-android/src/org/briarproject/android/CrashReportActivity.java
index bd7fad0bdc..01634602df 100644
--- a/briar-android/src/org/briarproject/android/CrashReportActivity.java
+++ b/briar-android/src/org/briarproject/android/CrashReportActivity.java
@@ -15,6 +15,7 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
+import android.provider.Settings;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.view.View.OnClickListener;
@@ -356,6 +357,13 @@ public class CrashReportActivity extends AppCompatActivity implements OnClickLis
if (btDiscoverable) btStatus += "discoverable";
else btStatus += "not discoverable";
if (bt != null) btStatus += "\nAddress: " + bt.getAddress();
+ try {
+ String btAddr = Settings.Secure.getString(getContentResolver(),
+ "bluetooth_address");
+ btStatus += "\nAddress from settings: " + btAddr;
+ } catch (SecurityException e) {
+ btStatus += "\nCould not get address from settings";
+ }
statusMap.put("Bluetooth:", btStatus);
// Stack trace
diff --git a/briar-android/src/org/briarproject/android/TestingActivity.java b/briar-android/src/org/briarproject/android/TestingActivity.java
index c21d207699..797188eba2 100644
--- a/briar-android/src/org/briarproject/android/TestingActivity.java
+++ b/briar-android/src/org/briarproject/android/TestingActivity.java
@@ -14,6 +14,7 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
+import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
@@ -359,6 +360,13 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
if (btDiscoverable) btStatus += "discoverable";
else btStatus += "not discoverable";
if (bt != null) btStatus += "\nAddress: " + bt.getAddress();
+ try {
+ String btAddr = Settings.Secure.getString(getContentResolver(),
+ "bluetooth_address");
+ btStatus += "\nAddress from settings: " + btAddr;
+ } catch (SecurityException e) {
+ btStatus += "\nCould not get address from settings";
+ }
statusMap.put("Bluetooth:", btStatus);
Map<TransportId, TransportProperties> props = Collections.emptyMap();
--
GitLab