Fix: Not show the "End engagement" dialog if the engagement ends by a…

… Visitor MOB-1284 MUIC-768
salemove · May 13, 2022 · f8ad1af · f8ad1af
1 parent f798429
commit f8ad1af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallController.java b/widgetssdk/src/main/java/com/glia/widgets/call/CallController.java
@@ -125,6 +125,7 @@ public void error(GliaException exception) {
 
     private final String TAG = "CallController";
     private volatile CallState callState;
+    private boolean isVisitorEndEngagement = false;
 
     private final CompositeDisposable disposables = new CompositeDisposable();
 
@@ -324,6 +325,7 @@ public void setViewCallback(CallViewCallback callViewCallback) {
 
     public void endEngagementDialogYesClicked() {
         Logger.d(TAG, "endEngagementDialogYesClicked");
+        isVisitorEndEngagement = true;
         stop();
         dialogController.dismissDialogs();
     }
@@ -464,8 +466,10 @@ public void onSurveyLoaded(@Nullable Survey survey) {
         if (viewCallback != null && survey != null) {
             viewCallback.navigateToSurvey(survey);
             Dependencies.getControllerFactory().destroyControllers();
-        } else {
+        } else if (!isVisitorEndEngagement) {
             dialogController.showEngagementEndedDialog();
+        } else {
+            Dependencies.getControllerFactory().destroyControllers();
         }
     }
 

diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/controller/ChatController.java b/widgetssdk/src/main/java/com/glia/widgets/chat/controller/ChatController.java
@@ -201,6 +201,7 @@ public void error(GliaException ex) {
     private final SiteInfoUseCase siteInfoUseCase;
     private final GliaSurveyUseCase surveyUseCase;
 
+    private boolean isVisitorEndEngagement = false;
     private Disposable disposable = null;
 
     // TODO pending photoCaptureFileUri - need to move some place better
@@ -545,6 +546,7 @@ public void unexpectedErrorDialogDismissed() {
 
     public void endEngagementDialogYesClicked() {
         Logger.d(TAG, "endEngagementDialogYesClicked");
+        isVisitorEndEngagement = true;
         stop();
         dialogController.dismissDialogs();
     }
@@ -1176,8 +1178,10 @@ public void onSurveyLoaded(@Nullable Survey survey) {
         if (viewCallback != null && survey != null) {
             viewCallback.navigateToSurvey(survey);
             Dependencies.getControllerFactory().destroyControllers();
-        } else {
+        } else if (!isVisitorEndEngagement) {
             dialogController.showEngagementEndedDialog();
+        } else {
+            Dependencies.getControllerFactory().destroyControllers();
         }
     }