Code refactor

Signed-off-by: Kipchirchir Sigei <[email protected]>
onaio · May 23, 2023 · 33ea555 · 33ea555
1 parent a30ed0f
commit 33ea555
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/onadata/libs/utils/analytics.py b/onadata/libs/utils/analytics.py
@@ -135,21 +135,21 @@ def get_event_label(self) -> str:
 
     def get_request_origin(self, request, tracking_properties):
         """Returns the request origin"""
+        event_source = "" # Initialize event_source variable
         if isinstance(self.tracked_obj, Instance):
-            event_source = ""  # Initialize event_source variable
+            event_source = "Submission collected from Web"
             browser_user_agents = ["Chrome", "Mozilla", "Safari"]
+
             try:
                 user_agent = request.META["HTTP_USER_AGENT"]
-                if "Android" in user_agent:
-                    event_source = "Submission collected from ODK COLLECT"
-                elif any(ua in user_agent for ua in browser_user_agents):
-                    event_source = "Submission collected from Enketo"
-                else:
-                    event_source = "Submission collected from Web"
             except KeyError:
                 pass
-        else:
-            event_source = ""
+
+            if "Android" in user_agent:
+                event_source = "Submission collected from ODK COLLECT"
+            elif any(ua in user_agent for ua in browser_user_agents):
+                event_source = "Submission collected from Enketo"
+
         tracking_properties.update({"from": event_source})
         return tracking_properties