Merge branch 'feat-koysnc-xpath' of https://github.com/jpirnay/crosspoint-reader into mybuild

src/activities/reader/KOReaderSyncActivity.cpp

@@ -235,6 +235,18 @@ void KOReaderSyncActivity::onExit() {
   wifiOff();
 }
 
+void KOReaderSyncActivity::closeCancelled() {
+  if (closeRequested) {
+    return;
+  }
+
+  closeRequested = true;
+  ActivityResult result;
+  result.isCancelled = true;
+  setResult(std::move(result));
+  finish();
+}
+
 void KOReaderSyncActivity::render(RenderLock&&) {
   const Rect contentRect = UITheme::getContentRect(renderer, true, false);
 
@@ -352,18 +364,13 @@ void KOReaderSyncActivity::render(RenderLock&&) {
 
 void KOReaderSyncActivity::loop() {
   if (state == NO_CREDENTIALS || state == SYNC_FAILED || state == UPLOAD_COMPLETE) {
-    if (state == UPLOAD_COMPLETE && millis() - uploadCompleteTime >= 3000) {
+    if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-      ActivityResult result;
+      closeCancelled();
-      result.isCancelled = true;
-      setResult(std::move(result));
-      finish();
       return;
     }
-    if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
+
-      ActivityResult result;
+    if (state == UPLOAD_COMPLETE && millis() - uploadCompleteTime >= 3000) {
-      result.isCancelled = true;
+      closeCancelled();
-      setResult(std::move(result));
-      finish();
     }
     return;
   }
@@ -393,10 +400,7 @@ void KOReaderSyncActivity::loop() {
     }
 
     if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-      ActivityResult result;
+      closeCancelled();
-      result.isCancelled = true;
-      setResult(std::move(result));
-      finish();
     }
     return;
   }
@@ -415,10 +419,7 @@ void KOReaderSyncActivity::loop() {
     }
 
     if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-      ActivityResult result;
+      closeCancelled();
-      result.isCancelled = true;
-      setResult(std::move(result));
-      finish();
     }
     return;
   }

src/activities/reader/KOReaderSyncActivity.h

@@ -80,8 +80,10 @@ class KOReaderSyncActivity final : public Activity {
 
   // Timestamp when UPLOAD_COMPLETE state was entered (for auto-close)
   unsigned long uploadCompleteTime = 0;
+  bool closeRequested = false;
 
   void onWifiSelectionComplete(bool success);
   void performSync();
   void performUpload();
+  void closeCancelled();
 };