Merge pull request commaai#386 from arne182/release2

update to latest release2

.gitignore

@@ -34,5 +34,9 @@ selfdrive/test/tests/plant/out
 selfdrive/visiond/visiond
 selfdrive/visiond/visiond-normal
 /src/
+apk/ai.comma.plus.offroad.apk
+openpilot
+selfdrive/data_collection/df-data
+selfdrive/data_collection/gps-data
 
 one

checkCustomAPK.py

@@ -37,7 +37,7 @@ def waitForConnection():
 
 if not path_exists:
   print "%s does not exist, installing" % apk_dir
-  waitForconnection()
+  waitForConnection()
   os.system("curl -L %s | python" % install_script)
 else:
   print "APK already installed"

selfdrive/crash.py

@@ -21,35 +21,30 @@ def install():
   from raven import Client
   from raven.transport.http import HTTPTransport
 
-  error_tags = {'dirty': dirty, 'branch': 'unknown'}
+  error_tags = {'dirty': dirty, 'username': 'char_error'}
 
   try:
     with open("/data/data/ai.comma.plus.offroad/files/persistStore/persist-auth", "r") as f:
       auth = json.loads(f.read())
     auth = json.loads(auth['commaUser'])
-    try:
-      error_tags['username'] = ''.join(char for char in auth['username'].decode('utf-8', 'ignore') if char.isalnum())
-    except:
-      error_tags['username'] = "char_error"
-    try:
-      error_tags['email'] = auth['email']
-    except:
-      pass
+    tags = ['username', 'email']
+    for tag in tags:
+      try:
+        error_tags[tag] = ''.join(char for char in auth[tag].decode('utf-8', 'ignore') if char.isalnum())
+      except:
+        pass
   except:
     pass
 
   try:
     with open("/data/params/d/CommunityPilotUser", "r") as f:
       auth = json.loads(f.read())
-
-    try:
-      error_tags['username'] = ''.join(char for char in auth['username'].decode('utf-8', 'ignore') if char.isalnum())
-    except:
-      error_tags['username'] = "char_error"
-    try:
-      error_tags['email'] = auth['email']
-    except:
-      pass
+    tags = ['username', 'email']
+    for tag in tags:
+      try:
+        error_tags[tag] = ''.join(char for char in auth[tag].decode('utf-8', 'ignore') if char.isalnum())
+      except:
+        pass
   except:
     pass