nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Quick fix for crash when connecting to a Miband with invalid address in settings.

This commit is contained in:
Andreas Shimokawa 2015-04-21 22:35:11 +02:00
parent e1a31ee92c
commit ab2f5a73a8
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
View File

@ -1,9 +1,5 @@
package nodomain.freeyourgadget.gadgetbridge; package nodomain.freeyourgadget.gadgetbridge;
import nodomain.freeyourgadget.gadgetbridge.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport;
import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleIoThread;
import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleSupport;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.Service; import android.app.Service;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
@ -23,6 +19,11 @@ import android.support.v4.content.LocalBroadcastManager;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import nodomain.freeyourgadget.gadgetbridge.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport;
import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleIoThread;
import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleSupport;
public class BluetoothCommunicationService extends Service { public class BluetoothCommunicationService extends Service {
public static final String ACTION_START public static final String ACTION_START
= "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.start"; = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.start";
@ -120,15 +121,15 @@ public class BluetoothCommunicationService extends Service {
} else { } else {
String btDeviceAddress = intent.getStringExtra("device_address"); String btDeviceAddress = intent.getStringExtra("device_address");
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
sharedPrefs.edit().putString("last_device_address", btDeviceAddress).commit(); sharedPrefs.edit().putString("last_device_address", btDeviceAddress).apply();
if (btDeviceAddress != null && !isConnected() && !isConnecting()) { if (btDeviceAddress != null && !isConnected() && !isConnecting()) {
if (mDeviceSupport != null) { if (mDeviceSupport != null) {
mDeviceSupport.dispose(); mDeviceSupport.dispose();
mDeviceSupport = null; mDeviceSupport = null;
} }
BluetoothDevice btDevice = mBtAdapter.getRemoteDevice(btDeviceAddress); try {
if (btDevice != null) { BluetoothDevice btDevice = mBtAdapter.getRemoteDevice(btDeviceAddress);
if (btDevice.getName() == null || btDevice.getName().equals("MI")) { //FIXME: workaround for Miband not being paired if (btDevice.getName() == null || btDevice.getName().equals("MI")) { //FIXME: workaround for Miband not being paired
mGBDevice = new GBDevice(btDeviceAddress, "MI", GBDevice.Type.MIBAND); mGBDevice = new GBDevice(btDeviceAddress, "MI", GBDevice.Type.MIBAND);
mDeviceSupport = new MiBandSupport(); mDeviceSupport = new MiBandSupport();
@ -143,6 +144,9 @@ public class BluetoothCommunicationService extends Service {
mGBDeviceIoThread = ((AbstractBTDeviceSupport) mDeviceSupport).getDeviceIOThread(); mGBDeviceIoThread = ((AbstractBTDeviceSupport) mDeviceSupport).getDeviceIOThread();
} }
} }
} catch (Exception e) {
Toast.makeText(this, "Cannot connect. BT address invalid?", Toast.LENGTH_SHORT).show();
e.printStackTrace();
} }
} }
} }