From 5fb8c7bed8518c381267957dfad89eeeb2f82b25 Mon Sep 17 00:00:00 2001
From: danielegobbetti <daniele+github@gobbetti.name>
Date: Fri, 18 Dec 2015 18:49:29 +0100
Subject: [PATCH] Use the right column for sorting upcoming events. Plus add
 forgotten getQueue

---
 .../freeyourgadget/gadgetbridge/model/CalendarEvents.java       | 2 +-
 .../gadgetbridge/service/devices/miband/MiBandSupport.java      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java
index 847648f2..eeb6651d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java
@@ -55,7 +55,7 @@ public class CalendarEvents {
         Uri eventsUri = eventsUriBuilder.build();
 
         Cursor evtCursor = null;
-        evtCursor = mContext.getContentResolver().query(eventsUri, EVENT_INSTANCE_PROJECTION, null, null, CalendarContract.Instances.DTSTART + " ASC");
+        evtCursor = mContext.getContentResolver().query(eventsUri, EVENT_INSTANCE_PROJECTION, null, null, CalendarContract.Instances.BEGIN + " ASC");
 
         if (evtCursor.moveToFirst()) {
             do {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
index 65adefc8..5145de6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
@@ -834,6 +834,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
                     builder.write(characteristic, alarmMessage);
                     iteration++;
                 }
+                builder.queue(getQueue());
             }
         } catch (IOException ex) {
             LOG.error("Unable to send Events to MI device", ex);