Backend fetch and Login are working now.

Finished removal of async login

Possible race condition occuring with ViewBinding

Fixed mapping issue.

Issue has been the key not being properly set

Issues involving primary keys not staying consistent resolved.

Moving into get events.

Author: koziodigitalinc

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

@@ -10,6 +10,15 @@
 import android.util.Log;
 
 import com.crashlytics.android.Crashlytics;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.RuntimeExceptionDao;
 import com.j256.ormlite.misc.TransactionManager;
@@ -22,15 +31,17 @@
 import com.zulip.android.models.Stream;
 import com.zulip.android.networking.AsyncUnreadMessagesUpdate;
 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 org.json.JSONArray;
-import org.json.JSONException;
-
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.sql.SQLException;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
@@ -41,7 +52,6 @@
 
 import io.fabric.sdk.android.Fabric;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
@@ -74,18 +84,6 @@ public class ZulipApp extends Application {
     private static final String MUTED_TOPIC_KEY = "mutedTopics";
     private ZulipServices zulipServices;
 
-    public Request goodRequest;
-    public Request badRequest;
-    private ZulipActivity zulipActivity;
-
-    public ZulipActivity getZulipActivity() {
-        return zulipActivity;
-    }
-
-    public void setZulipActivity(ZulipActivity zulipActivity) {
-        this.zulipActivity = zulipActivity;
-    }
-
     /**
      * Handler to manage batching of unread messages
      */
@@ -111,6 +109,7 @@ public void setZulipActivity(ZulipActivity zulipActivity) {
      * every couple of seconds
      */
     public final Queue<Integer> unreadMessageQueue = new ConcurrentLinkedQueue<>();
+    public String tester;
 
     public static ZulipApp get() {
         return instance;
@@ -185,14 +184,60 @@ public ZulipServices getZulipServices() {
                             .addInterceptor(new ZulipInterceptor())
                             .addInterceptor(logging)
                             .build())
-                    .addConverterFactory(GsonConverterFactory.create())
+                    .addConverterFactory(GsonConverterFactory.create(buildGson()))
                     .baseUrl(getServerURI())
                     .build()
                     .create(ZulipServices.class);
         }
         return zulipServices;
     }
 
+    private Gson buildGson() {
+        final Gson gson = new Gson();
+        return new GsonBuilder()
+                .registerTypeAdapter(UserConfigurationResponse.class, new TypeAdapter<UserConfigurationResponse>() {
+
+                    @Override
+                    public void write(JsonWriter out, UserConfigurationResponse value) throws IOException {
+                        gson.toJson(gson.toJsonTree(value), out);
+                    }
+
+                    @Override
+                    public UserConfigurationResponse read(JsonReader in) throws IOException {
+                        UserConfigurationResponse res = gson.fromJson(in, UserConfigurationResponse.class);
+
+                        RuntimeExceptionDao<Person, Object> personDao = ZulipApp.this.getDao(Person.class);
+                        for (int i = 0; i < res.getRealmUsers().size(); i++) {
+
+                            Person currentPerson = res.getRealmUsers().get(i);
+                            Person foundPerson = null;
+                            try {
+                                foundPerson = personDao.queryBuilder().where().eq(Person.EMAIL_FIELD, currentPerson.getEmail()).queryForFirst();
+                                if(foundPerson != null) {
+                                    currentPerson.setId(foundPerson.getId());
+                                }
+                            } catch (SQLException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        return res;
+                    }
+                })
+                .registerTypeAdapter(GetEventResponse.class, new JsonDeserializer<EventsBranch>() {
+                    @Override
+                    public EventsBranch deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+                        EventsBranch invalid = gson.fromJson(json, EventsBranch.class);
+                        Class<? extends EventsBranch> t = EventsBranch.BranchType.fromRawType(invalid);
+                        if(t != null) {
+                            return gson.fromJson(json, t);
+                        }
+                        Log.w("GSON", "Attempted to deserialize and unregistered EventBranch... See EventBranch.BranchType");
+                        return invalid;
+                    }
+                })
+                .create();
+    }
+
     /**
      * Fills the Emoji Table with the existing emoticons saved in the assets folder.
      */
@@ -249,20 +294,18 @@ public String getUserAgent() {
         }
     }
 
-    public void addToMutedTopics(JSONArray jsonArray) {
+    public void addToMutedTopics(List<List<String>> mutedTopics) {
         Stream stream;
 
-        for (int i = 0; i < jsonArray.length(); i++) {
-            try {
-                JSONArray mutedTopic = jsonArray.getJSONArray(i);
-                stream = Stream.getByName(this, mutedTopic.get(0).toString());
-                mutedTopics.add(stream.getId() + mutedTopic.get(1).toString());
-            } catch (JSONException e) {
-                Log.e("JSONException", "JSON Is not correct", e);
+        if(mutedTopics != null) {
+            for (int i = 0; i < mutedTopics.size(); i++) {
+                List<String> mutedTopic = mutedTopics.get(i);
+                stream = Stream.getByName(this, mutedTopic.get(0));
+                this.mutedTopics.add(stream.getId() + mutedTopic.get(1));
             }
         }
         SharedPreferences.Editor editor = settings.edit();
-        editor.putStringSet(MUTED_TOPIC_KEY, new HashSet<>(mutedTopics));
+        editor.putStringSet(MUTED_TOPIC_KEY, new HashSet<>(this.mutedTopics));
         editor.apply();
     }
 

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

@@ -0,0 +1,21 @@
+package com.zulip.android.activities;
+
+import android.support.v7.app.AppCompatActivity;
+
+import com.zulip.android.ZulipApp;
+import com.zulip.android.service.ZulipServices;
+
+/**
+ * Created by patrykpoborca on 8/25/16.
+ */
+
+public class BaseActivity extends AppCompatActivity {
+
+    protected ZulipApp getApp() {
+        return ZulipApp.get();
+    }
+
+    protected ZulipServices getServices() {
+        return getApp().getZulipServices();
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.zulip.android.activities;
 
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,7 +8,8 @@
 
 import com.zulip.android.R;
 import com.zulip.android.networking.AsyncDevGetEmails;
-import com.zulip.android.networking.AsyncLogin;
+import com.zulip.android.networking.response.LoginResponse;
+import com.zulip.android.networking.util.DefaultCallback;
 import com.zulip.android.util.AuthClickListener;
 import com.zulip.android.util.ZLog;
 
@@ -20,10 +20,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import retrofit2.Call;
+import retrofit2.Response;
+
 /**
  * Activity where the Emails for the DevAuthBackend are displayed.
  */
-public class DevAuthActivity extends Activity {
+public class DevAuthActivity extends BaseActivity {
     private RecyclerView recyclerView;
     private ProgressDialog connectionProgressDialog;
 
@@ -58,9 +61,19 @@ protected void onCreate(Bundle savedInstanceState) {
         authEmailAdapter.setOnItemClickListener(new AuthClickListener() {
             @Override
             public void onItemClick(String email) {
-                AsyncLogin asyncLogin = new AsyncLogin(DevAuthActivity.this, email, null, true);
-                asyncLogin.execute();
-                connectionProgressDialog.show();
+                if(email.contains("@")) {
+                    getApp().setEmail(email);
+                }
+                getServices()
+                        .loginDEV(email)
+                        .enqueue(new DefaultCallback<LoginResponse>() {
+                            @Override
+                            public void onSuccess(Call<LoginResponse> call, Response<LoginResponse> response) {
+                                super.onSuccess(call, response);
+                                getApp().setLoggedInApiKey(response.body().getApiKey());
+                                openHome();
+                            }
+                        });
             }
         });
         recyclerView.setLayoutManager(new LinearLayoutManager(DevAuthActivity.this) {