Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

If Bluetooth is enabled but not discoverable, warn but continue.

Browse Source
This commit is contained in:
akwizgran
2013-03-11 13:56:12 +00:00
parent 787c428874
commit 78ccebf357
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
View File

@@ -39,7 +39,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
status.setPadding(10, 10, 10, 10); status.setPadding(10, 10, 10, 10);
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if(adapter == null) { if(adapter == null) {
bluetoothStateChanged(false); listener.bluetoothStateChanged(false);
ImageView warning = new ImageView(ctx); ImageView warning = new ImageView(ctx);
warning.setImageResource(R.drawable.alerts_and_states_warning); warning.setImageResource(R.drawable.alerts_and_states_warning);
warning.setPadding(10, 10, 10, 10); warning.setPadding(10, 10, 10, 10);
@@ -47,7 +47,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
status.setText(R.string.bluetooth_not_available); status.setText(R.string.bluetooth_not_available);
addView(status); addView(status);
} else if(adapter.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE) { } else if(adapter.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
bluetoothStateChanged(true); listener.bluetoothStateChanged(true);
ImageView ok = new ImageView(ctx); ImageView ok = new ImageView(ctx);
ok.setImageResource(R.drawable.navigation_accept); ok.setImageResource(R.drawable.navigation_accept);
ok.setPadding(10, 10, 10, 10); ok.setPadding(10, 10, 10, 10);
@@ -59,7 +59,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
settings.setOnClickListener(this); settings.setOnClickListener(this);
addView(settings); addView(settings);
} else if(adapter.isEnabled()) { } else if(adapter.isEnabled()) {
bluetoothStateChanged(false); listener.bluetoothStateChanged(true);
ImageView warning = new ImageView(ctx); ImageView warning = new ImageView(ctx);
warning.setImageResource(R.drawable.alerts_and_states_warning); warning.setImageResource(R.drawable.alerts_and_states_warning);
warning.setPadding(10, 10, 10, 10); warning.setPadding(10, 10, 10, 10);
@@ -71,7 +71,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
settings.setOnClickListener(this); settings.setOnClickListener(this);
addView(settings); addView(settings);
} else { } else {
bluetoothStateChanged(false); listener.bluetoothStateChanged(false);
ImageView warning = new ImageView(ctx); ImageView warning = new ImageView(ctx);
warning.setImageResource(R.drawable.alerts_and_states_warning); warning.setImageResource(R.drawable.alerts_and_states_warning);
warning.setPadding(10, 10, 10, 10); warning.setPadding(10, 10, 10, 10);
@@ -85,10 +85,6 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
} }
} }
private void bluetoothStateChanged(boolean enabled) {
listener.bluetoothStateChanged(enabled);
}
public void onClick(View view) { public void onClick(View view) {
getContext().startActivity(new Intent(ACTION_BLUETOOTH_SETTINGS)); getContext().startActivity(new Intent(ACTION_BLUETOOTH_SETTINGS));
} }