Device name can be null in some circumstances (#61)

microbit-matt-hillsdon · web-flow · commit eaea9ad27651 · 2024-04-30T15:59:36.000+01:00
We didn't reproduce this but based on this crash and similar guards elsewhere in the code this seems a reasonable fix. https://play.google.com/console/u/0/developers/4695663865375895527/app/4975736116501095047/vitals/crashes/e9abff6694fe9443f6d3423bb5f7b44b/details?days=28&versionCode=57&isUserPerceived=true
diff --git a/app/src/main/java/com/samsung/microbit/utils/BLEPair.java b/app/src/main/java/com/samsung/microbit/utils/BLEPair.java
@@ -643,7 +643,7 @@ public void onReceive(Context context, Intent intent) {
                 final int state = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.ERROR);
                 final int prevState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE, BluetoothDevice.ERROR);
                 logi("pairReceiver -" + " name = " + name + " addr = " + addr + " state = " + state + " prevState = " + prevState);
-                if (name.isEmpty() || addr.isEmpty()) {
+                if (name == null || name.isEmpty() || addr.isEmpty()) {
                     return;
                 }
                 // Check the changed device is the one we are trying to pair

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ public void onReceive(Context context, Intent intent) {`
`643`	`643`	`final int state = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.ERROR);`
`644`	`644`	`final int prevState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE, BluetoothDevice.ERROR);`
`645`	`645`	`logi("pairReceiver -" + " name = " + name + " addr = " + addr + " state = " + state + " prevState = " + prevState);`
`646`		`- if (name.isEmpty() \|\| addr.isEmpty()) {`
	`646`	`+ if (name == null \|\| name.isEmpty() \|\| addr.isEmpty()) {`
`647`	`647`	`return;`
`648`	`648`	`}`
`649`	`649`	`// Check the changed device is the one we are trying to pair`