Merge branch '774-adding-contacts-via-bluetooth-only-fails' into 'master'

Use uuid created from the commitment/payload instead of the uuid returned from getUuid()

Signed-off-by: goapunk <noobie@goapunks.net>

Closes #774

See merge request !435

briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java

@@ -387,7 +387,7 @@ class DroidtoothPlugin implements DuplexPlugin {
 		BluetoothServerSocket ss;
 		try {
 			ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
-					"RFCOMM", getUuid());
+					"RFCOMM", uuid);
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return null;
@@ -472,7 +472,7 @@ class DroidtoothPlugin implements DuplexPlugin {
 		BluetoothServerSocket ss;
 		try {
 			ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
-					"RFCOMM", getUuid());
+					"RFCOMM", uuid);
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return null;