Fixed up logic regarding error responses for event queue's in Async get events.

Removed authorship.

Incremented db version.

Author: koziodigitalinc

app/src/main/java/com/zulip/android/ZulipApp.java

@@ -114,6 +114,7 @@ public class ZulipApp extends Application {
      */
     public final Queue<Integer> unreadMessageQueue = new ConcurrentLinkedQueue<>();
     public String tester;
+    private Gson gson;
 
     public static ZulipApp get() {
         return instance;
@@ -193,15 +194,22 @@ public ZulipServices getZulipServices() {
                             .addInterceptor(new ZulipInterceptor())
                             .addInterceptor(logging)
                             .build())
-                    .addConverterFactory(GsonConverterFactory.create(buildGson()))
+                    .addConverterFactory(GsonConverterFactory.create(getGson()))
                     .baseUrl(getServerURI())
                     .build()
                     .create(ZulipServices.class);
         }
         return zulipServices;
     }
 
-    public Gson buildGson() {
+    public Gson getGson() {
+        if(gson == null) {
+            gson = buildGson();
+        }
+        return gson;
+    }
+
+    private Gson buildGson() {
         final Gson naiveGson = new GsonBuilder()
                 .registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
                     public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {

app/src/main/java/com/zulip/android/database/DatabaseHelper.java

@@ -1,7 +1,5 @@
 package com.zulip.android.database;
 
-import java.sql.SQLException;
-
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
@@ -18,6 +16,8 @@
 import com.zulip.android.models.Stream;
 import com.zulip.android.util.MD5Util;
 
+import java.sql.SQLException;
+
 /**
  * Database helper class used to manage the creation and upgrading of your
  * database. This class also usually provides the DAOs used by the other
@@ -30,7 +30,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     private static final String DATABASE_NAME = "zulip-%s.db";
     // any time you make changes to your database objects, you may have to
     // increase the database version
-    private static final int DATABASE_VERSION = 5;
+    private static final int DATABASE_VERSION = 6;
 
     public DatabaseHelper(ZulipApp app, String email) {
         super(app, String.format(DATABASE_NAME, MD5Util.md5Hex(email)), null,

app/src/main/java/com/zulip/android/networking/AsyncGetEvents.java

@@ -203,8 +203,14 @@ public void run() {
                             .execute();
 
                     GetEventResponse body = eventResponse.body();
+
                     if (!eventResponse.isSuccessful()) {
-                        if (eventResponse.code() == 400 && ((body != null && body.getMsg().contains("Bad event queue id"))
+
+                        NetworkError errorBody = eventResponse.errorBody() != null ?
+                                app.getGson().fromJson(eventResponse.errorBody().string(), NetworkError.class)
+                                : null;
+
+                        if (eventResponse.code() == 400 && ((errorBody != null && errorBody.getMsg().contains("Bad event queue id"))
                                 || eventResponse.message().contains("too old"))) {
                             // Queue dead. Register again.
                             Log.w(ASYNC_GET_EVENTS, "Queue dead");

app/src/main/java/com/zulip/android/networking/NetworkError.java

@@ -0,0 +1,19 @@
+package com.zulip.android.networking;
+
+import com.google.gson.annotations.SerializedName;
+
+public class NetworkError {
+
+    @SerializedName("msg")
+    private String msg;
+    @SerializedName("result")
+    private String result;
+
+    public String getResult() {
+        return result;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}