mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-08-30 02:56:03 +02:00
Display known devices from db even if Bluetooth is off or unsupported
This allows to view activity data without turning bt on or connecting to the pebble emulator via tcp/ip (needs modified manifest for internet access)
This commit is contained in:
parent
6f02f9e350
commit
5a49f1215e
@ -3,7 +3,6 @@ package nodomain.freeyourgadget.gadgetbridge.util;
|
|||||||
import android.bluetooth.BluetoothAdapter;
|
import android.bluetooth.BluetoothAdapter;
|
||||||
import android.bluetooth.BluetoothDevice;
|
import android.bluetooth.BluetoothDevice;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
@ -16,7 +15,6 @@ import java.util.List;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
|
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.GBException;
|
|
||||||
import nodomain.freeyourgadget.gadgetbridge.R;
|
import nodomain.freeyourgadget.gadgetbridge.R;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
|
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
|
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
|
||||||
@ -100,27 +98,28 @@ public class DeviceHelper {
|
|||||||
GB.toast(context, context.getString(R.string.bluetooth_is_not_supported_), Toast.LENGTH_SHORT, GB.WARN);
|
GB.toast(context, context.getString(R.string.bluetooth_is_not_supported_), Toast.LENGTH_SHORT, GB.WARN);
|
||||||
} else if (!btAdapter.isEnabled()) {
|
} else if (!btAdapter.isEnabled()) {
|
||||||
GB.toast(context, context.getString(R.string.bluetooth_is_disabled_), Toast.LENGTH_SHORT, GB.WARN);
|
GB.toast(context, context.getString(R.string.bluetooth_is_disabled_), Toast.LENGTH_SHORT, GB.WARN);
|
||||||
} else {
|
}
|
||||||
List<GBDevice> dbDevices = getDatabaseDevices();
|
List<GBDevice> dbDevices = getDatabaseDevices();
|
||||||
|
if (btAdapter != null) {
|
||||||
List<GBDevice> bondedDevices = getBondedDevices(btAdapter);
|
List<GBDevice> bondedDevices = getBondedDevices(btAdapter);
|
||||||
availableDevices.addAll(bondedDevices);
|
availableDevices.addAll(bondedDevices);
|
||||||
availableDevices.addAll(dbDevices);
|
}
|
||||||
|
availableDevices.addAll(dbDevices);
|
||||||
|
|
||||||
Prefs prefs = GBApplication.getPrefs();
|
Prefs prefs = GBApplication.getPrefs();
|
||||||
String miAddr = prefs.getString(MiBandConst.PREF_MIBAND_ADDRESS, "");
|
String miAddr = prefs.getString(MiBandConst.PREF_MIBAND_ADDRESS, "");
|
||||||
if (miAddr.length() > 0) {
|
if (miAddr.length() > 0) {
|
||||||
GBDevice miDevice = new GBDevice(miAddr, "MI", DeviceType.MIBAND);
|
GBDevice miDevice = new GBDevice(miAddr, "MI", DeviceType.MIBAND);
|
||||||
if (!availableDevices.contains(miDevice)) {
|
if (!availableDevices.contains(miDevice)) {
|
||||||
availableDevices.add(miDevice);
|
availableDevices.add(miDevice);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
String pebbleEmuAddr = prefs.getString("pebble_emu_addr", "");
|
String pebbleEmuAddr = prefs.getString("pebble_emu_addr", "");
|
||||||
String pebbleEmuPort = prefs.getString("pebble_emu_port", "");
|
String pebbleEmuPort = prefs.getString("pebble_emu_port", "");
|
||||||
if (pebbleEmuAddr.length() >= 7 && pebbleEmuPort.length() > 0) {
|
if (pebbleEmuAddr.length() >= 7 && pebbleEmuPort.length() > 0) {
|
||||||
GBDevice pebbleEmuDevice = new GBDevice(pebbleEmuAddr + ":" + pebbleEmuPort, "Pebble qemu", DeviceType.PEBBLE);
|
GBDevice pebbleEmuDevice = new GBDevice(pebbleEmuAddr + ":" + pebbleEmuPort, "Pebble qemu", DeviceType.PEBBLE);
|
||||||
availableDevices.add(pebbleEmuDevice);
|
availableDevices.add(pebbleEmuDevice);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return availableDevices;
|
return availableDevices;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user