mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-12-26 02:25:50 +01:00
Hotfix for connection issues on API < 24
Fix #1055 properly, as the previous change was not solving the issues on API < 24. This affected the connection to some devices and caused a crash on graph access.
This commit is contained in:
parent
f88ef0e688
commit
c71eba9483
@ -33,15 +33,15 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
|
|||||||
|
|
||||||
public class DateTimeUtils {
|
public class DateTimeUtils {
|
||||||
private static SimpleDateFormat DAY_STORAGE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
|
private static SimpleDateFormat DAY_STORAGE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
|
||||||
public static SimpleDateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
|
public static SimpleDateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZZZ", Locale.US);
|
||||||
|
|
||||||
public static String formatDateTime(Date date) {
|
public static String formatDateTime(Date date) {
|
||||||
return DateUtils.formatDateTime(GBApplication.getContext(), date.getTime(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_NO_YEAR);
|
return DateUtils.formatDateTime(GBApplication.getContext(), date.getTime(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_NO_YEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String formatIso8601(Date date) {
|
public static String formatIso8601(Date date) {
|
||||||
if(!GBApplication.isRunningNougatOrLater()){
|
if(GBApplication.isRunningNougatOrLater()){
|
||||||
return new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZZZ", Locale.US).format(date);
|
return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US).format(date);
|
||||||
}
|
}
|
||||||
return ISO_8601_FORMAT.format(date);
|
return ISO_8601_FORMAT.format(date);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user