Merge pull request #642 from shankari/release_v280

Update the motion activity inputs to support version 11.0.1 of google…
e-mission · Mar 25, 2019 · 1739d60 · 1739d60
2 parents 8b1c570 + 780eed0
commit 1739d60
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/emission/net/usercache/formatters/android/motion_activity.py b/emission/net/usercache/formatters/android/motion_activity.py
@@ -31,8 +31,10 @@ def format(entry):
         data.type = ecwa.MotionTypes(entry.data.zzbjA).value
     elif 'ajO' in entry.data:
         data.type = ecwa.MotionTypes(entry.data.ajO).value
-    else:
+    elif 'zzaKM' in entry.data:
         data.type = ecwa.MotionTypes(entry.data.zzaKM).value
+    else:
+        data.type = ecwa.MotionTypes(entry.data.zzbhB).value
 
 
     if 'agc' in entry.data:
@@ -43,8 +45,10 @@ def format(entry):
         data.confidence = entry.data.zzbjB
     elif 'ajP' in entry.data:
         data.confidence = entry.data.ajP
-    else:
+    elif 'zzaKN' in entry.data:
         data.confidence = entry.data.zzaKN
+    else:
+        data.confidence = entry.data.zzbhC
 
     data.ts = formatted_entry.metadata.write_ts
     data.local_dt = formatted_entry.metadata.write_local_dt