Make deferredIntent usage conditional on server flag

Also return from onMenuItem() immediately after triggering deferredIntent
TrainAsONE · Jun 13, 2022 · 818ae61 · 818ae61
1 parent a58ae30
commit 818ae61
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/source/DownloadRequest.mc b/source/DownloadRequest.mc
@@ -157,6 +157,7 @@ class DownloadRequest extends RequestDelegate {
          *   we can exclude the device uniqueIdentifer returned by the Simulator
          */
         var deviceSettings = System.getDeviceSettings();
+        // Application.getApp().log("uniqueIdentifier(" + deviceSettings.uniqueIdentifier + ")");
         if (deviceSettings.monkeyVersion[0] < 3 && !deviceSettings.uniqueIdentifier.equals($.ExcludeViewStackWorkaroundPreMonkeyV3)) {
           Ui.popView(Ui.SLIDE_IMMEDIATE);
         }

diff --git a/source/TaoModel.mc b/source/TaoModel.mc
@@ -15,12 +15,14 @@ const STORE_STEP_NAME = "stepName";
 const STORE_ADJUST_TEMPERATURE = "adjustTemperature";
 const STORE_ADJUST_UNDULATION = "adjustUndulation";
 const STORE_INCLUDE_RUN_BACK_STEP = "includeRunBackStep";
+const STORE_DEFERRED_INTENT = "deferredIntent";
 
 const PREF_WORKOUT_STEP_NAME = "workoutStepName";
 const PREF_WORKOUT_STEP_TARGET = "workoutStepTarget";
 const PREF_ADJUST_FOR_TEMPERATURE = "adjustForTemperature";
 const PREF_ADJUST_FOR_UNDULATION ="adjustForUndulation";
 const PREF_INCLUDE_RUN_BACK_STEP = "includeRunBackStep";
+const PREF_DEFERRED_INTENT = "deferredIntent";
 
 const SUMMARY_NAME = "name";
 const SUMMARY_DISPLAY_PREFERENCES = "displayPreferences";
@@ -84,6 +86,7 @@ class TaoModel {
     loadPref(PREF_ADJUST_FOR_TEMPERATURE, STORE_ADJUST_TEMPERATURE);
     loadPref(PREF_ADJUST_FOR_UNDULATION, STORE_ADJUST_UNDULATION);
     loadPref(PREF_INCLUDE_RUN_BACK_STEP, STORE_INCLUDE_RUN_BACK_STEP);
+    loadPref(PREF_DEFERRED_INTENT, STORE_DEFERRED_INTENT);
     // Application.getApp().log("start: " + serverUrl + " " + accessToken);
   }
 
@@ -134,6 +137,10 @@ class TaoModel {
     return adjustBooleanPreference(PREF_INCLUDE_RUN_BACK_STEP);
   }
 
+  function deferredIntent() {
+    return adjustBooleanPreference(PREF_DEFERRED_INTENT);
+  }
+
   function adjustBooleanPreference(prefName) {
     var newVal = !mergedPreference(prefName);
     localPref[prefName] = newVal;

diff --git a/source/WorkoutDelegate.mc b/source/WorkoutDelegate.mc
@@ -106,8 +106,13 @@ class WorkoutMenuDelegate extends Ui.MenuInputDelegate {
         break;
       case :startWorkout:
         // Use deferred intent handling workaround from Garmin to avoid issues on 645 firmware (SDK 3.0.3)
-        // System.exitTo(mModel.downloadIntent);
-        _activeTransaction = new self.DeferredIntent(self, mModel.downloadIntent);
+        Application.getApp().log("intent: " + (mModel.deferredIntent ? "deferred" : "instant"));
+        if (mModel.deferredIntent) {
+          _activeTransaction = new self.DeferredIntent(self, mModel.downloadIntent);
+          return;
+        } else {
+          System.exitTo(mModel.downloadIntent);
+        }
         break;
       default:
         Ui.popView(Ui.SLIDE_IMMEDIATE);