Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add logic for setting/re-setting "Fdroid" name tag for bluetooth device

Browse Source
This commit is contained in:
n8fr8 2015-07-13 14:41:21 -04:00
parent d662c15fb8
commit cc6b2736ce
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
View File

@ -29,6 +29,9 @@ public class BluetoothServer extends Thread {
private final Context context; private final Context context;
private String deviceBluetoothName = null;
public final static String BLUETOOTH_NAME_TAG = "FDroid:";
public BluetoothServer(Context context) { public BluetoothServer(Context context) {
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
} }
@ -43,14 +46,26 @@ public class BluetoothServer extends Thread {
Utils.closeQuietly(serverSocket); Utils.closeQuietly(serverSocket);
} }
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
adapter.setName(deviceBluetoothName.replace(BLUETOOTH_NAME_TAG,""));
} }
@Override @Override
public void run() { public void run() {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
//store the original bluetoothname, and update this one to be unique
deviceBluetoothName = adapter.getName();
if (!deviceBluetoothName.contains(BLUETOOTH_NAME_TAG))
adapter.setName(BLUETOOTH_NAME_TAG + deviceBluetoothName);
try { try {
serverSocket = adapter.listenUsingRfcommWithServiceRecord("FDroid App Swap", BluetoothConstants.fdroidUuid()); serverSocket = adapter.listenUsingInsecureRfcommWithServiceRecord("FDroid App Swap", BluetoothConstants.fdroidUuid());
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "Error starting Bluetooth server socket, will stop the server now - " + e.getMessage()); Log.e(TAG, "Error starting Bluetooth server socket, will stop the server now - " + e.getMessage());
return; return;