From f11977597b90c5f16b87deec4fbb01ec70fb548c Mon Sep 17 00:00:00 2001 From: Daniel Dakhno Date: Tue, 27 Oct 2020 23:51:35 +0100 Subject: [PATCH] Fossil Hybrid: use GB.toast() --- .../qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java | 6 ++---- .../requests/fossil_hr/file/FileEncryptedGetRequest.java | 4 +++- .../requests/fossil_hr/file/FileEncryptedPutRequest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java index ec3f6cf4c..990b965ee 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java @@ -140,8 +140,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { try { getSecretKey(); } catch (IllegalAccessException e) { - e.printStackTrace(); - toast(e.getMessage()); + GB.toast("erro getting key: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e); new TransactionBuilder("init fail") .add(new SetDeviceStateAction(getDeviceSupport().getDevice(), GBDevice.State.AUTHENTICATION_REQUIRED, getContext())) .queue(getDeviceSupport().getQueue()); @@ -593,8 +592,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { this )); } catch (IllegalAccessException e) { - e.printStackTrace(); - toast(e.getMessage()); + GB.toast("error getting key: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e); getDeviceSupport().getDevice().setState(GBDevice.State.AUTHENTICATION_REQUIRED); getDeviceSupport().getDevice().sendDeviceUpdateIntent(getContext()); getDeviceSupport().getQueue().clear(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java index d06bd168f..d94d45a46 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java @@ -17,6 +17,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file; import android.bluetooth.BluetoothGattCharacteristic; +import android.widget.Toast; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -38,6 +39,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.foss import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.file.FileHandle; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.FossilRequest; import nodomain.freeyourgadget.gadgetbridge.util.CRC32C; +import nodomain.freeyourgadget.gadgetbridge.util.GB; public abstract class FileEncryptedGetRequest extends FossilRequest { private short handle; @@ -75,7 +77,7 @@ public abstract class FileEncryptedGetRequest extends FossilRequest { try { keySpec = new SecretKeySpec(this.adapter.getSecretKey(), "AES"); } catch (IllegalAccessException e) { - e.printStackTrace(); + GB.toast("error getting key: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e); return; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java index f19dd36e8..8f0af0e8f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java @@ -95,7 +95,7 @@ public class FileEncryptedPutRequest extends FossilRequest { try { keySpec = new SecretKeySpec(this.adapter.getSecretKey(), "AES"); } catch (IllegalAccessException e) { - e.printStackTrace(); + GB.toast("error getting key: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e); return; } try {