From 576f9ec261221d838826fb4706d68fc2445c3d6f Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Fri, 25 Aug 2023 00:06:24 +0200
Subject: [PATCH] Remove session endpoint id extra

---
 app/src/org/commcare/activities/DispatchActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/org/commcare/activities/DispatchActivity.java b/app/src/org/commcare/activities/DispatchActivity.java
index 6674e8d403..6e32b654cb 100644
--- a/app/src/org/commcare/activities/DispatchActivity.java
+++ b/app/src/org/commcare/activities/DispatchActivity.java
@@ -350,6 +350,10 @@ private void handleExternalLaunch() {
                         i.putExtra(SESSION_ENDPOINT_ID, sessionEndpointId);
                         i.putExtra(SESSION_ENDPOINT_ARGUMENTS_BUNDLE, args);
                         i.putStringArrayListExtra(SESSION_ENDPOINT_ARGUMENTS_LIST, argsList);
+
+                        // Session Endpoint extra is no longer needed. If not removed, it triggers
+                        // the external launch logic in subsequent logins
+                        getIntent().removeExtra(SESSION_ENDPOINT_ID);
                     }
                     if (i != null) {
                         i.putExtra(WAS_EXTERNAL, true);