Fix: Crash on narrow to pm with notification bot.

Fixes #244

Author: Sam1301

app/src/androidTest/java/com/zulip/android/test/UnsortedTests.java

@@ -217,7 +217,7 @@ public void testAGOMFetch() throws SQLException, InterruptedException,
     private Message sampleMessage(ZulipApp app, int id) throws SQLException {
         Message rtr = new Message(app);
         rtr.setSender(Person.getOrUpdate(app, "Test User",
-                TESTUSER_EXAMPLE_COM, ""));
+                TESTUSER_EXAMPLE_COM, "", 0));
         rtr.setContent("Test message");
         rtr.setType(MessageType.PRIVATE_MESSAGE);
         rtr.setRecipient(new String[]{TESTUSER_EXAMPLE_COM});

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

@@ -44,6 +44,7 @@
 import java.lang.reflect.Type;
 import java.sql.SQLException;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.Callable;
@@ -242,7 +243,12 @@ public Message deserialize(JsonElement json, Type typeOfT, JsonDeserializationCo
                         } else {
                             Message.ZulipDirectMessage msg = naiveGson.fromJson(json, Message.ZulipDirectMessage.class);
                             if (msg.getDisplayRecipient() != null) {
-                                msg.setRecipients(msg.getDisplayRecipient().toArray(new Person[msg.getDisplayRecipient().size()]));
+                                List<Person> people = msg.getDisplayRecipient();
+                                for (Person person : people) {
+                                    person.setId(person.getRecipientId());
+                                }
+
+                                msg.setRecipients(people.toArray(new Person[people.size()]));
                             }
 
                             msg.setContent(Message.formatContent(msg.getFormattedContent(), ZulipApp.get()).toString());
@@ -390,7 +396,13 @@ public String getEmail() {
 
     public void setEmail(String email) {
         databaseHelper = new DatabaseHelper(this, email);
-        this.you = Person.getOrUpdate(this, email, null, null);
+        if (this.getYou() != null) {
+            // on every consequent refresh
+            this.you = Person.getOrUpdate(this, email, null, null, this.getYou().getId());
+        } else {
+            // only on first login
+            this.you = Person.getOrUpdate(this, email, null, null, 0);
+        }
     }
 
     public DatabaseHelper getDatabaseHelper() {

app/src/main/java/com/zulip/android/models/Message.java

@@ -148,7 +148,8 @@ public Message(ZulipApp app, JSONObject message,
         this.setSender(Person.getOrUpdate(app,
                 message.getString("sender_email"),
                 message.getString("sender_full_name"),
-                message.getString("avatar_url"), personCache));
+                message.getString("avatar_url"),
+                Integer.parseInt(message.getString("sender_id")), personCache));
 
         if (message.getString("type").equals("stream")) {
             this.setType(MessageType.STREAM_MESSAGE);
@@ -178,7 +179,7 @@ public Message(ZulipApp app, JSONObject message,
             for (int i = 0; i < jsonRecipients.length(); i++) {
                 JSONObject obj = jsonRecipients.getJSONObject(i);
                 Person person = Person.getOrUpdate(app, obj.getString("email"),
-                        obj.getString("full_name"), null, personCache);
+                        obj.getString("full_name"), null, Integer.parseInt(obj.getString("sender_id")), personCache);
                 r[i] = person;
             }
             setRecipients(recipientList(r));
@@ -234,7 +235,7 @@ public Void call() throws Exception {
                     RuntimeExceptionDao<Message, Object> messageDao = app.getDao(Message.class);
 
                     for (Message m : messages) {
-                        Person person = Person.getOrUpdate(app, m.getSenderEmail(), m.getSenderFullName(), m.getAvatarUrl());
+                        Person person = Person.getOrUpdate(app, m.getSenderEmail(), m.getSenderFullName(), m.getAvatarUrl(), m.getSenderId());
                         m.setSender(person);
                         Stream stream = null;
                         if (m.getType() == MessageType.STREAM_MESSAGE) {
@@ -429,14 +430,14 @@ public void setRecipients(Person[] list) {
         this.recipientsCache = list;
 
         try {
-            Person to = ZulipApp.get().getDao(Person.class, true).queryBuilder().where().eq(Person.EMAIL_FIELD, list[0].getEmail()).queryForFirst();
-            ;
+            Person to = list[0];
+
             if (list.length == 1) {
                 setRecipients(to.getId() + "");
                 return;
             }
-            Person from = ZulipApp.get().getDao(Person.class, true).queryBuilder().where().eq(Person.EMAIL_FIELD, list[1].getEmail()).queryForFirst();
 
+            Person from = list[1];
             if (to == null && from != null) {
                 setRecipients("" + from.getId());
             }

app/src/main/java/com/zulip/android/models/Person.java

@@ -62,6 +62,9 @@ public class Person {
     @SerializedName("is_mirror_dummy")
     private boolean isMirrorDummy;
 
+    @SerializedName("id")
+    private int recipientId;
+
     public Person(String name, String email) {
         this.setName(name);
         this.setEmail(email);
@@ -113,7 +116,7 @@ public static Person getByEmail(Dao<Person, ?> dao, String email) {
 
     @SuppressWarnings("WeakerAccess")
     public static Person getOrUpdate(ZulipApp app, String email, String name,
-                                     String avatarURL, Map<String, Person> personCache) {
+                                     String avatarURL, int personId, Map<String, Person> personCache) {
 
         Person person = null;
 
@@ -130,6 +133,7 @@ public static Person getOrUpdate(ZulipApp app, String email, String name,
 
         if (person == null) {
             person = new Person(name, email, avatarURL);
+            person.setId(personId);
             app.getDao(Person.class).create(person);
         } else {
             boolean changed = false;
@@ -149,8 +153,8 @@ public static Person getOrUpdate(ZulipApp app, String email, String name,
     }
 
     public static Person getOrUpdate(ZulipApp app, String email, String name,
-                                     String avatarURL) {
-        return getOrUpdate(app, email, name, avatarURL, null);
+                                     String avatarURL, int personId) {
+        return getOrUpdate(app, email, name, avatarURL, personId, null);
     }
 
     public static Person getById(ZulipApp app, int id) {
@@ -284,4 +288,11 @@ public void setActive(boolean active) {
         isActive = active;
     }
 
+    public int getRecipientId() {
+        return this.recipientId;
+    }
+
+    public void setRecipientId(int id) {
+        this.recipientId = id;
+    }
 }