diff --git a/briar-android/src/org/briarproject/android/CrashReportActivity.java b/briar-android/src/org/briarproject/android/CrashReportActivity.java index bd7fad0bdc7f481cc7bd5c0389c98d6349de30d6..01634602df3d6dce8bbff7aa32ffe41c7dfe5c0f 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 c21d2076992de5d46287f3b3c43dc890050c7e0f..797188eba2d8c30f891013d67dda1f0f47745b74 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();