From 80fb05e44a81f201da6dcaff925a38751693cccc Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 5 May 2020 14:11:46 +0200
Subject: [PATCH] ZeTime: Fix could not synchronize calendar on connect

Fixes #1188
---
 CHANGELOG.md                                      |  1 +
 .../externalevents/CalendarReceiver.java          |  2 +-
 .../devices/zetime/ZeTimeDeviceSupport.java       | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b185afbba..0efbab544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * ZeTime: Support setting the watch language
 * ZeTime: Support rejecting calls
 * ZeTime: Try to fix weather conditions on newer firmwares
+* ZeTime: Fix could not synchronize calendar on connect
 
 #### Version 0.43.3
 * Fossil Hybrid HR: Initial support for activity tracking (no sleep yet)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
index d7343d6cc..933fa53e0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
@@ -101,7 +101,7 @@ public class CalendarReceiver extends BroadcastReceiver {
             DaoSession session = dbHandler.getDaoSession();
             syncCalendar(eventList, session);
         } catch (Exception e1) {
-            GB.toast("Database Error while syncing Calendar", Toast.LENGTH_SHORT, GB.ERROR);
+            GB.toast("Database Error while syncing Calendar", Toast.LENGTH_SHORT, GB.ERROR, e1);
         }
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
index 99d512fad..da992fca1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
@@ -71,9 +71,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
-/**
- * Created by Kranz on 08.02.2018.
- */
 
 public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
     private static final Logger LOG = LoggerFactory.getLogger(ZeTimeDeviceSupport.class);
@@ -141,8 +138,6 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
         initMusicVolume(builder);
         onReadReminders(builder);
 
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
-        LOG.info("Initialization Done");
         return builder;
     }
 
@@ -1038,6 +1033,16 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
             versionCmd.hwVersion = new String(string);
         }
         evaluateGBDeviceEvent(versionCmd);
+
+        TransactionBuilder builder = new TransactionBuilder("setDeviceInitialized");
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
+        try {
+            performConnected(builder.getTransaction());
+        } catch (IOException e) {
+            LOG.error("could not set device to initzialized: ", e);
+        }
+
+        LOG.info("Initialization Done");
     }
 
     private void handleActivityFetching(byte[] msg) {