MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-29 13:26:50 +01:00
Code Releases Wiki Activity

Fossil HR: added timeout to on-device confirmation

Browse Source
This commit is contained in:
Daniel Dakhno 2021-12-13 03:04:44 +01:00
parent dbdeb59f9c
commit 45647ccbf7
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java
View File

@ -91,7 +91,7 @@ import static nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybr
public class FossilWatchAdapter extends WatchAdapter { public class FossilWatchAdapter extends WatchAdapter {
private ArrayList<Request> requestQueue = new ArrayList<>(); private ArrayList<Request> requestQueue = new ArrayList<>();
private FossilRequest fossilRequest; protected FossilRequest fossilRequest;
private int MTU = 23; private int MTU = 23;

43
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
View File

@ -62,6 +62,8 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -219,7 +221,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
return; return;
} }
boolean shouldAuthenticateOnWatch = getDeviceSpecificPreferences().getBoolean("enable_on_device_confirmation", true); boolean shouldAuthenticateOnWatch = getDeviceSpecificPreferences().getBoolean("enable_on_device_confirmation", true);
if(!shouldAuthenticateOnWatch){ if (!shouldAuthenticateOnWatch) {
GB.toast("Skipping on-device confirmation", Toast.LENGTH_SHORT, GB.INFO); GB.toast("Skipping on-device confirmation", Toast.LENGTH_SHORT, GB.INFO);
initializeAfterWatchConfirmation(false); initializeAfterWatchConfirmation(false);
return; return;
@ -227,30 +229,45 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
confirmOnWatch(); confirmOnWatch();
} }
TimerTask confirmTimeoutRunnable = new TimerTask() {
@Override
public void run() {
if (!(fossilRequest instanceof ConfirmOnDeviceRequest)) {
return;
}
GB.toast("Confirmation timeout, continuing", Toast.LENGTH_SHORT, GB.INFO);
((ConfirmOnDeviceRequest) fossilRequest).onResult(false);
}
};
private void confirmOnWatch() { private void confirmOnWatch() {
queueWrite(new CheckDeviceNeedsConfirmationRequest() { queueWrite(new CheckDeviceNeedsConfirmationRequest() {
@Override @Override
public void onResult(boolean needsConfirmation) { public void onResult(boolean needsConfirmation) {
GB.log("needs confirmation: " + needsConfirmation, GB.INFO, null); GB.log("needs confirmation: " + needsConfirmation, GB.INFO, null);
if(needsConfirmation){ if (needsConfirmation) {
final Timer timer = new Timer();
GB.toast("please confirm on device.", Toast.LENGTH_SHORT, GB.INFO); GB.toast("please confirm on device.", Toast.LENGTH_SHORT, GB.INFO);
queueWrite( new ConfirmOnDeviceRequest(){ queueWrite(new ConfirmOnDeviceRequest() {
@Override @Override
public void onResult(boolean confirmationSuccess) { public void onResult(boolean confirmationSuccess) {
if(!confirmationSuccess){ isFinished = true;
timer.cancel();
if (!confirmationSuccess) {
GB.toast("connection unconfirmed on watch, unauthenticated mode", Toast.LENGTH_LONG, GB.ERROR); GB.toast("connection unconfirmed on watch, unauthenticated mode", Toast.LENGTH_LONG, GB.ERROR);
} }
initializeAfterWatchConfirmation(confirmationSuccess); initializeAfterWatchConfirmation(confirmationSuccess);
} }
}, true); }, true);
}else{ timer.schedule(confirmTimeoutRunnable, 30000);
} else {
initializeAfterWatchConfirmation(true); initializeAfterWatchConfirmation(true);
} }
} }
}); });
} }
private void initializeAfterWatchConfirmation(boolean authenticated){ private void initializeAfterWatchConfirmation(boolean authenticated) {
setNotificationConfigurations(); setNotificationConfigurations();
setQuickRepliesConfiguration(); setQuickRepliesConfiguration();
@ -331,9 +348,9 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
// Set default icons // Set default icons
ArrayList<NotificationImage> images = new ArrayList<>(); ArrayList<NotificationImage> images = new ArrayList<>();
images.add(new NotificationImage("icIncomingCall.icon", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_phone_outline)), 24, 24)); images.add(new NotificationImage("icIncomingCall.icon", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_phone_outline)), 24, 24));
images.add(new NotificationImage("icMissedCall.icon", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_phone_missed_outline)), 24,24)); images.add(new NotificationImage("icMissedCall.icon", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_phone_missed_outline)), 24, 24));
images.add(new NotificationImage("icMessage.icon", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_message_outline)),24,24)); images.add(new NotificationImage("icMessage.icon", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_message_outline)), 24, 24));
images.add(new NotificationImage("general_white.bin", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_alert_circle_outline)),24,24)); images.add(new NotificationImage("general_white.bin", NotificationImage.getEncodedIconFromDrawable(getContext().getResources().getDrawable(R.drawable.ic_alert_circle_outline)), 24, 24));
// Set default notification filters // Set default notification filters
ArrayList<NotificationHRConfiguration> notificationFilters = new ArrayList<>(); ArrayList<NotificationHRConfiguration> notificationFilters = new ArrayList<>();
@ -363,7 +380,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
private String[] getQuickReplies() { private String[] getQuickReplies() {
ArrayList<String> configuredReplies = new ArrayList<>(); ArrayList<String> configuredReplies = new ArrayList<>();
Prefs prefs = new Prefs(getDeviceSpecificPreferences()); Prefs prefs = new Prefs(getDeviceSpecificPreferences());
for (int i=1; i<=16; i++) { for (int i = 1; i <= 16; i++) {
String quickReply = prefs.getString("canned_message_dismisscall_" + i, null); String quickReply = prefs.getString("canned_message_dismisscall_" + i, null);
if (quickReply != null) { if (quickReply != null) {
configuredReplies.add(quickReply); configuredReplies.add(quickReply);
@ -1072,7 +1089,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
} }
} }
if(!packageFound) { if (!packageFound) {
LOG.info("Package not found in notificationConfigurations, using generic icon: " + sourceAppId); LOG.info("Package not found in notificationConfigurations, using generic icon: " + sourceAppId);
queueWrite(new PlayTextNotificationRequest("generic", senderOrTitle, notificationSpec, this)); queueWrite(new PlayTextNotificationRequest("generic", senderOrTitle, notificationSpec, this));
} }
@ -1301,7 +1318,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
} }
@Override @Override
public void pushConfigJson(String configJson){ public void pushConfigJson(String configJson) {
configJson = configJson.replace("\n", ""); configJson = configJson.replace("\n", "");
queueWrite(new JsonPutRequest(configJson, this)); queueWrite(new JsonPutRequest(configJson, this));
} }
@ -1524,7 +1541,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
@Override @Override
public void onFindDevice(boolean start) { public void onFindDevice(boolean start) {
super.onFindDevice(start); super.onFindDevice(start);
if(start){ if (start) {
queueWrite(new ConfirmOnDeviceRequest()); queueWrite(new ConfirmOnDeviceRequest());
} }
} }