add _hasCompleted to prevent goForward from being called after naviga…

…tion starts
CareEvolution · Jul 3, 2024 · 0502c46 · 0502c46
1 parent 7f9abbb
commit 0502c46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ORK1Kit/ORK1Kit/Common/ORK1WebViewStepViewController.m b/ORK1Kit/ORK1Kit/Common/ORK1WebViewStepViewController.m
@@ -57,6 +57,7 @@ @interface ORK1WebViewStepViewController ()
 @implementation ORK1WebViewStepViewController {
     NSString *_result;
     NSString *_originalResult;
+    BOOL _hasCompleted;
 }
 
 #pragma mark Public Interface
@@ -214,9 +215,10 @@ - (void)userContentController:(WKUserContentController *)userContentController d
 /// Returns YES if the view controller should stop processing any other messages. Assumes that `shouldProcessScriptMessages` is true.
 /// - Parameter message: The message to process.
 - (BOOL)processScriptMessage:(WKScriptMessage *)message {
-    if ([message.name isEqualToString:ResearchKitCompleteStepMessageName] && [message.body isKindOfClass:[NSString class]]) {
+    if ([message.name isEqualToString:ResearchKitCompleteStepMessageName] && [message.body isKindOfClass:[NSString class]] && !_hasCompleted) {
         _result = (NSString *)message.body;
         [self goForward];
+        _hasCompleted = YES;
         return YES;
     }
 

diff --git a/ResearchKit/Common/ORKWebViewStepViewController.m b/ResearchKit/Common/ORKWebViewStepViewController.m
@@ -66,6 +66,7 @@ @implementation ORKWebViewStepViewController {
     NSString *_originalResult;
     ORKNavigationContainerView *_navigationFooterView;
     NSArray<NSLayoutConstraint *> *_constraints;
+    BOOL _hasCompleted;
 }
 
 #pragma mark Public Interface
@@ -316,9 +317,10 @@ - (void)userContentController:(WKUserContentController *)userContentController d
 /// Returns YES if the view controller should stop processing any other messages. Assumes that `shouldProcessScriptMessages` is true.
 /// - Parameter message: The message to process.
 - (BOOL)processScriptMessage:(WKScriptMessage *)message {
-    if ([message.name isEqualToString:ResearchKitCompleteStepMessageName] && [message.body isKindOfClass:[NSString class]]) {
+    if ([message.name isEqualToString:ResearchKitCompleteStepMessageName] && [message.body isKindOfClass:[NSString class]] && !_hasCompleted) {
         _result = (NSString *)message.body;
         [self goForward];
+        _hasCompleted = YES;
         return YES;
     }