From 19c13b8a328ba68363c645b363ceda89de6fe7eb Mon Sep 17 00:00:00 2001 From: Dylan Garrett Date: Tue, 4 Jan 2022 12:21:58 -0800 Subject: [PATCH] [plugin] Exporter: ensure we're connected before sending highlights (#8604) --- plugins/exporter.koplugin/main.lua | 43 ++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/plugins/exporter.koplugin/main.lua b/plugins/exporter.koplugin/main.lua index 1917b4f2d..232fd8452 100644 --- a/plugins/exporter.koplugin/main.lua +++ b/plugins/exporter.koplugin/main.lua @@ -299,14 +299,21 @@ For more information, please visit https://github.com/koreader/koreader/wiki/Hig return not self:isDocless() and self:readyToExport() and not self.txt_export end, callback = function() - UIManager:scheduleIn(0.5, function() - self:exportCurrentNotes(self.view) - end) + local export_callback = function() + UIManager:nextTick(function() + self:exportCurrentNotes(self.view) + end) - UIManager:show(InfoMessage:new{ - text = _("Exporting may take several seconds…"), - timeout = 1, - }) + UIManager:show(InfoMessage:new{ + text = _("Exporting may take several seconds…"), + timeout = 1, + }) + end + if self.joplin_export or self.readwise_export then + NetworkMgr:runWhenOnline(export_callback) + else + export_callback() + end end }, { @@ -315,14 +322,22 @@ For more information, please visit https://github.com/koreader/koreader/wiki/Hig return self:readyToExport() end, callback = function() - UIManager:scheduleIn(0.5, function() - self:exportAllNotes() - end) + local export_callback = function() + UIManager:nextTick(function() + self:exportAllNotes() + end) + + UIManager:show(InfoMessage:new{ + text = _("Exporting may take several minutes…"), + timeout = 1, + }) + end + if self.joplin_export or self.readwise_export then + NetworkMgr:runWhenOnline(export_callback) + else + export_callback() + end - UIManager:show(InfoMessage:new{ - text = _("Exporting may take several minutes…"), - timeout = 1, - }) end, separator = true, },