Remove code that attempts to fetch location data

src/main/java/org/commcare/formplayer/application/MenuController.java

@@ -14,7 +14,6 @@
 import org.commcare.formplayer.beans.menus.BaseResponseBean;
 import org.commcare.formplayer.beans.menus.EntityDetailListResponse;
 import org.commcare.formplayer.beans.menus.EntityDetailResponse;
-import org.commcare.formplayer.beans.menus.LocationRelevantResponseBean;
 import org.commcare.formplayer.services.FormplayerStorageFactory;
 import org.commcare.formplayer.services.MenuSessionFactory;
 import org.commcare.formplayer.services.ResponseMetaDataTracker;
@@ -93,7 +92,7 @@ public EntityDetailListResponse getDetails(@RequestBody SessionNavigationBean se
             if (detail == null) {
                 throw new RuntimeException("Could not get inline details");
             }
-            return setLocationNeeds(detail, menuSession);
+            return detail;
         }
 
         String[] selections = sessionNavigationBean.getSelections();
@@ -130,7 +129,7 @@ public EntityDetailListResponse getDetails(@RequestBody SessionNavigationBean se
             if (detail == null) {
                 throw new RuntimeException("Tried to get details while not on a case list.");
             }
-            return setLocationNeeds(new EntityDetailListResponse(detail), menuSession);
+            return new EntityDetailListResponse(detail);
         }
         EntityScreen entityScreen = (EntityScreen)currentScreen;
         TreeReference reference = entityScreen.resolveTreeReference(detailSelection);
@@ -140,14 +139,11 @@ public EntityDetailListResponse getDetails(@RequestBody SessionNavigationBean se
         }
 
         restoreFactory.cacheSessionSelections(selections);
-        return setLocationNeeds(
-                new EntityDetailListResponse(entityScreen,
-                        menuSession.getEvalContextWithHereFuncHandler(),
-                        reference,
-                        storageFactory.getPropertyManager().isFuzzySearchEnabled(),
-                        sessionNavigationBean.getIsShortDetail()),
-                menuSession
-        );
+        return new EntityDetailListResponse(entityScreen,
+                    menuSession.getSessionWrapper().getEvaluationContext(),
+                    reference,
+                    storageFactory.getPropertyManager().isFuzzySearchEnabled(),
+                    sessionNavigationBean.getIsShortDetail());
     }
 
     /**
@@ -193,7 +189,7 @@ public BaseResponseBean navigateSessionWithAuth(@RequestBody SessionNavigationBe
             return formSubmissionResponse;
         } else {
             notificationLogger.logNotification(response.getNotification(), request);
-            return setLocationNeeds(response, menuSession);
+            return response;
         }
     }
 
@@ -217,13 +213,6 @@ private SubmitResponseBean handleAutoFormSubmission(HttpServletRequest request,
         return null;
     }
 
-    private static <T extends LocationRelevantResponseBean> T setLocationNeeds(T responseBean,
-            MenuSession menuSession) {
-        responseBean.setShouldRequestLocation(menuSession.locationRequestNeeded());
-        responseBean.setShouldWatchLocation(menuSession.hereFunctionEvaluated());
-        return responseBean;
-    }
-
     @RequestMapping(value = Constants.URL_GET_ENDPOINT, method = RequestMethod.POST)
     @UserLock
     @UserRestore
@@ -246,7 +235,7 @@ public BaseResponseBean navigateToEndpoint(@RequestBody SessionNavigationBean se
             return formSubmissionResponse;
         } else {
             notificationLogger.logNotification(response.getNotification(), request);
-            return setLocationNeeds(response, menuSession);
+            return response;
         }
     }
 }

src/main/java/org/commcare/formplayer/beans/EvaluateXPathResponseBean.java

@@ -1,6 +1,5 @@
 package org.commcare.formplayer.beans;
 
-import org.commcare.formplayer.beans.menus.LocationRelevantResponseBean;
 import org.commcare.formplayer.exceptions.ApplicationConfigException;
 import org.commcare.formplayer.util.Constants;
 import org.commcare.formplayer.util.FormplayerSentry;
@@ -25,7 +24,7 @@
 /**
  * Created by willpride on 1/20/16.
  */
-public class EvaluateXPathResponseBean extends LocationRelevantResponseBean {
+public class EvaluateXPathResponseBean {
     private String output;
     private String status;
     private String contentType;

src/main/java/org/commcare/formplayer/beans/debugger/MenuDebuggerContentResponseBean.java

@@ -1,14 +1,12 @@
 package org.commcare.formplayer.beans.debugger;
 
-import org.commcare.formplayer.beans.menus.LocationRelevantResponseBean;
-
 import java.util.HashSet;
 import java.util.List;
 
 /**
  * Response for the debugger tab
  */
-public class MenuDebuggerContentResponseBean extends LocationRelevantResponseBean {
+public class MenuDebuggerContentResponseBean {
     private String appId;
     private AutoCompletableItem[] autoCompletableItems;
     private XPathQueryItem[] recentXPathQueries;

src/main/java/org/commcare/formplayer/beans/menus/BaseResponseBean.java

@@ -17,7 +17,7 @@
  * end should redirect to the app home NOTE: clearSession causes all other displayables to be
  * disregarded
  */
-public class BaseResponseBean extends LocationRelevantResponseBean {
+public class BaseResponseBean {
     protected NotificationMessage notification;
     protected String title;
     protected boolean clearSession;

src/main/java/org/commcare/formplayer/beans/menus/EntityDetailListResponse.java

@@ -14,7 +14,7 @@
 /**
  * Created by willpride on 1/4/17.
  */
-public class EntityDetailListResponse extends LocationRelevantResponseBean {
+public class EntityDetailListResponse {
 
     private EntityDetailResponse[] entityDetailList;
     private boolean isPersistentDetail;

src/main/java/org/commcare/formplayer/services/MenuSessionFactory.java

@@ -232,7 +232,6 @@ public MenuSession buildSession(SerializableMenuSession serializableMenuSession,
     @Trace
     public MenuSession getMenuSessionFromBean(SessionNavigationBean sessionNavigationBean) throws Exception {
         MenuSession menuSession = performInstall(sessionNavigationBean);
-        menuSession.setCurrentBrowserLocation(sessionNavigationBean.getGeoLocation());
         menuSession.setWindowWidth(sessionNavigationBean.getWindowWidth());
         return menuSession;
     }

src/main/java/org/commcare/formplayer/services/MenuSessionRunnerService.java

@@ -35,7 +35,6 @@
 import org.commcare.formplayer.session.MenuSession;
 import org.commcare.formplayer.util.Constants;
 import org.commcare.formplayer.util.FormplayerDatadog;
-import org.commcare.formplayer.util.FormplayerHereFunctionHandler;
 import org.commcare.formplayer.util.SimpleTimer;
 import org.commcare.formplayer.web.client.WebClient;
 import org.commcare.modern.session.SessionWrapper;
@@ -189,7 +188,6 @@ public BaseResponseBean getNextMenu(@Nullable Screen nextScreen, MenuSession men
                     return getNextMenu(null, menuSession, queryData, entityScreenContext);
                 }
             }
-            addHereFuncHandler((EntityScreen)nextScreen, menuSession);
             menuResponseBean = new EntityListResponse((EntityScreen)nextScreen);
             datadog.addRequestScopedTag(Constants.MODULE_TAG, "case_list");
             Sentry.setTag(Constants.MODULE_TAG, "case_list");
@@ -226,12 +224,6 @@ private void setPeristenMenuToBean(BaseResponseBean menuResponseBean, ArrayList<
         }
     }
 
-    private void addHereFuncHandler(EntityScreen nextScreen, MenuSession menuSession) {
-        EvaluationContext ec = nextScreen.getEvalContext();
-        ec.addFunctionHandler(
-                new FormplayerHereFunctionHandler(menuSession, menuSession.getCurrentBrowserLocation()));
-    }
-
     @Trace
     public BaseResponseBean advanceSessionWithSelections(MenuSession menuSession,
             String[] selections, QueryData queryData) throws Exception {
@@ -650,11 +642,11 @@ private static EntityDetailListResponse getDetail(MenuSession menuSession, boole
 
         EvaluationContext ec;
         if (inline) {
-            ec = menuSession.getEvalContextWithHereFuncHandler();
+            ec = menuSession.getSessionWrapper().getEvaluationContext();
             return new EntityDetailListResponse(persistentDetail.getFlattenedDetails(), ec, reference,
                     isFuzzySearchEnabled);
         } else {
-            ec = new EvaluationContext(menuSession.getEvalContextWithHereFuncHandler(), reference);
+            ec = new EvaluationContext(menuSession.getSessionWrapper().getEvaluationContext(), reference);
             EntityDetailResponse detailResponse = new EntityDetailResponse(persistentDetail, ec);
             detailResponse.setHasInlineTile(entityDatum.getInlineDetail() != null);
             return new EntityDetailListResponse(detailResponse);
@@ -723,9 +715,9 @@ private NewFormResponse startFormEntry(MenuSession menuSession) throws Exception
 
     private String getAssertionFailure(MenuSession menuSession) {
         Text text = menuSession.getSessionWrapper().getCurrentEntry().getAssertions().getAssertionFailure(
-                menuSession.getEvalContextWithHereFuncHandler());
+                menuSession.getSessionWrapper().getEvaluationContext());
         if (text != null) {
-            return text.evaluate(menuSession.getEvalContextWithHereFuncHandler());
+            return text.evaluate(menuSession.getSessionWrapper().getEvaluationContext());
         }
         return null;
     }

src/main/java/org/commcare/formplayer/session/MenuSession.java

@@ -19,7 +19,6 @@
 import org.commcare.formplayer.services.FormplayerStorageFactory;
 import org.commcare.formplayer.services.InstallService;
 import org.commcare.formplayer.services.RestoreFactory;
-import org.commcare.formplayer.util.FormplayerHereFunctionHandler;
 import org.commcare.formplayer.util.SessionUtils;
 import org.commcare.formplayer.util.StringUtils;
 import org.commcare.formplayer.util.serializer.SessionSerializer;
@@ -68,7 +67,7 @@
  *
  * A lot of this is copied from the CLI. We need to merge that. Big TODO
  */
-public class MenuSession implements HereFunctionHandlerListener {
+public class MenuSession {
     private final SerializableMenuSession session;
     private final boolean isPersistentMenuEnabled;
     private final boolean isAutoAdvanceMenu;
@@ -460,38 +459,6 @@ public void setSmartLinkRedirect(String url) {
         smartLinkRedirect = url;
     }
 
-    public void setCurrentBrowserLocation(String location) {
-        this.currentBrowserLocation = location;
-    }
-
-    public String getCurrentBrowserLocation() {
-        return this.currentBrowserLocation;
-    }
-
-    @Override
-    public void onEvalLocationChanged() {
-    }
-
-    @Override
-    public void onHereFunctionEvaluated() {
-        this.hereFunctionEvaluated = true;
-    }
-
-    public boolean locationRequestNeeded() {
-        return this.hereFunctionEvaluated && this.currentBrowserLocation == null;
-    }
-
-    public boolean hereFunctionEvaluated() {
-        return this.hereFunctionEvaluated;
-    }
-
-    @Trace
-    public EvaluationContext getEvalContextWithHereFuncHandler() {
-        EvaluationContext ec = sessionWrapper.getEvaluationContext();
-        ec.addFunctionHandler(new FormplayerHereFunctionHandler(this, currentBrowserLocation));
-        return ec;
-    }
-
     public SerializableMenuSession serialize() {
         session.setCommcareSession(SessionSerializer.serialize(sessionWrapper));
         return session;