Merge pull request #562 from RocketChat/fix/push-crash

Fix crash deserializing message json

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 47
-        versionName "1.0.24"
+        versionCode 48
+        versionName "1.0.25"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -528,9 +528,9 @@ object PushManager {
 
             init {
                 val json = JSONObject(sender)
-                _id = json.getString("_id")
+                _id = json.optString("_id")
                 username = json.getString("username")
-                name = json.getString("name")
+                name = json.optString("name")
             }
         }
     }