Deserialization for GetEvents is now working

merging

Revert "Remove humbug references from variable names"

This reverts commit a93948e.

Fix end of input at character 0 in AsyncGetOldMessages

Changes return value in ZulipAsyncPushTask.doInBackground to null on
failed request instead of an empty string. AsyncGetOldMessages is coded
to test for failure by checking for null value.

Undid the humbug revert.

Undid the humbug revert.

Events are updating. Fixing up AsyncGetOldMessages

Author: koziodigitalinc

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

@@ -20,6 +20,8 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.ObjectCache;
+import com.j256.ormlite.dao.ReferenceObjectCache;
 import com.j256.ormlite.dao.RuntimeExceptionDao;
 import com.j256.ormlite.misc.TransactionManager;
 import com.zulip.android.activities.ZulipActivity;
@@ -33,13 +35,13 @@
 import com.zulip.android.networking.ZulipInterceptor;
 import com.zulip.android.networking.response.UserConfigurationResponse;
 import com.zulip.android.networking.response.events.EventsBranch;
-import com.zulip.android.networking.response.events.GetEventResponse;
 import com.zulip.android.service.ZulipServices;
 import com.zulip.android.util.ZLog;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.sql.SQLException;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -83,6 +85,7 @@ public class ZulipApp extends Application {
     private Set<String> mutedTopics;
     private static final String MUTED_TOPIC_KEY = "mutedTopics";
     private ZulipServices zulipServices;
+    private ReferenceObjectCache objectCache;
 
     /**
      * Handler to manage batching of unread messages
@@ -168,6 +171,13 @@ public int getAppVersion() {
         }
     }
 
+    public ObjectCache getObjectCache() {
+        if(objectCache == null) {
+            objectCache = new ReferenceObjectCache(true);
+        }
+        return objectCache;
+    }
+
     private void afterLogin() {
         String email = settings.getString(EMAIL, null);
         setEmail(email);
@@ -176,9 +186,7 @@ private void afterLogin() {
 
     public ZulipServices getZulipServices() {
         if(zulipServices == null) {
-            HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-            logging.setLevel(HttpLoggingInterceptor.Level.BASIC);
-
+            HttpLoggingInterceptor logging = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY);
             zulipServices = new Retrofit.Builder()
                     .client(new OkHttpClient.Builder().readTimeout(60, TimeUnit.SECONDS)
                             .addInterceptor(new ZulipInterceptor())
@@ -192,19 +200,40 @@ public ZulipServices getZulipServices() {
         return zulipServices;
     }
 
-    private Gson buildGson() {
-        final Gson gson = new Gson();
+    public Gson buildGson() {
+        final Gson naiveGson = new Gson();
+        final Gson nestedGson = new GsonBuilder()
+                .registerTypeAdapter(Message.class, new JsonDeserializer<Message>() {
+                    @Override
+                    public Message deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+                        Message msg;
+                        if("stream".equalsIgnoreCase(json.getAsJsonObject().get("type").getAsString())) {
+                            msg = naiveGson.fromJson(json, Message.ZulipStreamMessage.class);
+                        }
+                        msg = naiveGson.fromJson(json, Message.ZulipDirectMessage.class);
+
+
+                        return msg;
+                    }
+                }).create();
+
+
         return new GsonBuilder()
+                .registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
+                    public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+                        return new Date(json.getAsJsonPrimitive().getAsLong());
+                    }
+                })
                 .registerTypeAdapter(UserConfigurationResponse.class, new TypeAdapter<UserConfigurationResponse>() {
 
                     @Override
                     public void write(JsonWriter out, UserConfigurationResponse value) throws IOException {
-                        gson.toJson(gson.toJsonTree(value), out);
+                        nestedGson.toJson(nestedGson.toJsonTree(value), out);
                     }
 
                     @Override
                     public UserConfigurationResponse read(JsonReader in) throws IOException {
-                        UserConfigurationResponse res = gson.fromJson(in, UserConfigurationResponse.class);
+                        UserConfigurationResponse res = nestedGson.fromJson(in, UserConfigurationResponse.class);
 
                         RuntimeExceptionDao<Person, Object> personDao = ZulipApp.this.getDao(Person.class);
                         for (int i = 0; i < res.getRealmUsers().size(); i++) {
@@ -220,16 +249,17 @@ public UserConfigurationResponse read(JsonReader in) throws IOException {
                                 e.printStackTrace();
                             }
                         }
+
                         return res;
                     }
                 })
-                .registerTypeAdapter(GetEventResponse.class, new JsonDeserializer<EventsBranch>() {
+                .registerTypeAdapter(EventsBranch.class, new JsonDeserializer<EventsBranch>() {
                     @Override
                     public EventsBranch deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                        EventsBranch invalid = gson.fromJson(json, EventsBranch.class);
+                        EventsBranch invalid = nestedGson.fromJson(json, EventsBranch.class);
                         Class<? extends EventsBranch> t = EventsBranch.BranchType.fromRawType(invalid);
                         if(t != null) {
-                            return gson.fromJson(json, t);
+                            return nestedGson.fromJson(json, t);
                         }
                         Log.w("GSON", "Attempted to deserialize and unregistered EventBranch... See EventBranch.BranchType");
                         return invalid;
@@ -352,16 +382,24 @@ public DatabaseHelper getDatabaseHelper() {
     }
 
     @SuppressWarnings("unchecked")
-    public <C, T> RuntimeExceptionDao<C, T> getDao(Class<C> cls) {
+    public <C, T> RuntimeExceptionDao<C, T> getDao(Class<C> cls, boolean useCache) {
         try {
-            return new RuntimeExceptionDao<>(
+            RuntimeExceptionDao<C, T> ret = new RuntimeExceptionDao<>(
                     (Dao<C, T>) databaseHelper.getDao(cls));
+            if(useCache) {
+                ret.setObjectCache(objectCache);
+            }
+            return ret;
         } catch (SQLException e) {
             // Well that's sort of awkward.
             throw new RuntimeException(e);
         }
     }
 
+    public <C, T> RuntimeExceptionDao<C, T> getDao(Class<C> cls) {
+        return getDao(cls, false);
+    }
+
     public void setContext(Context targetContext) {
         this.attachBaseContext(targetContext);
     }

app/src/main/java/com/zulip/android/activities/LoginActivity.java

@@ -148,7 +148,7 @@ protected void onStop() {
     }
 
     private void checkForError() {
-        String serverURL = serverIn.getText().toString();
+        String serverURL = "https://zulip.tabbott.net";//serverIn.getText().toString();
         int errorMessage = R.string.invalid_server_domain;
         String httpScheme = (BuildConfig.DEBUG) ? "http" : "https";
 
@@ -354,14 +354,15 @@ public void onClick(View v) {
                 setupGoogleSignIn();
                 break;
             case R.id.zulip_login:
-                if (!isInputValid()) {
-                    return;
-                }
+//                if (!isInputValid()) {
+//                    return;
+//                }
                 connectionProgressDialog.show();
-                String username = mUserName.getText().toString();
+                String username = "@gmail.com ";//mUserName.getText().toString();
+                String password = ""; //mPassword.getText().toString()
                 getApp().setEmail(username);
                 getServices()
-                        .login(username, mPassword.getText().toString())
+                        .login(username, password)
                         .enqueue(new DefaultCallback<LoginResponse>() {
 
                             @Override