Merge pull request #2466 from dimagi/externalLaunchFix

Clean session before exiting from external launch
dimagi · May 6, 2021 · 7385d16 · 7385d16
2 parents 855ac66 + 4c3a3ce
commit 7385d16
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/src/org/commcare/activities/HomeScreenBaseActivity.java b/app/src/org/commcare/activities/HomeScreenBaseActivity.java
@@ -220,7 +220,7 @@ private void processSessionEndpoint() {
                     if (intentArgumentsAsBundle != null) {
                         CommCareApplication.instance().getCurrentSessionWrapper()
                                 .executeEndpointStack(endpoint, AndroidUtil.bundleAsMap(intentArgumentsAsBundle));
-                    } else {
+                    } else if (intentArgumentsAsList != null) {
                         CommCareApplication.instance().getCurrentSessionWrapper()
                                 .executeEndpointStack(endpoint, intentArgumentsAsList);
                     }
@@ -834,6 +834,7 @@ private boolean processReturnFromFormEntry(int resultCode, Intent intent) {
                 refreshUI();
 
                 if (wasExternal) {
+                    currentState.reset();
                     setResult(RESULT_CANCELED);
                     this.finish();
                     return false;