Use server generated Person ids.

Author: Sam1301

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

@@ -24,7 +24,6 @@
 import com.j256.ormlite.dao.ReferenceObjectCache;
 import com.j256.ormlite.dao.RuntimeExceptionDao;
 import com.j256.ormlite.misc.TransactionManager;
-import com.j256.ormlite.stmt.SelectArg;
 import com.zulip.android.activities.ZulipActivity;
 import com.zulip.android.database.DatabaseHelper;
 import com.zulip.android.models.Emoji;
@@ -266,26 +265,7 @@ public void write(JsonWriter out, UserConfigurationResponse value) throws IOExce
 
                     @Override
                     public UserConfigurationResponse read(JsonReader in) throws IOException {
-                        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++) {
-
-                            Person currentPerson = res.getRealmUsers().get(i);
-                            Person foundPerson = null;
-                            try {
-                                foundPerson = personDao.queryBuilder().where().eq(Person.EMAIL_FIELD,
-                                        new SelectArg(Person.EMAIL_FIELD, currentPerson.getEmail()))
-                                        .queryForFirst();
-                                if (foundPerson != null) {
-                                    currentPerson.setId(foundPerson.getId());
-                                }
-                            } catch (SQLException e) {
-                                ZLog.logException(e);
-                            }
-                        }
-
-                        return res;
+                        return nestedGson.fromJson(in, UserConfigurationResponse.class);
                     }
                 })
                 .registerTypeAdapter(EventsBranch.class, new JsonDeserializer<EventsBranch>() {

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

@@ -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 = 7;
+    private static final int DATABASE_VERSION = 8;
 
     public DatabaseHelper(ZulipApp app, String email) {
         super(app, String.format(DATABASE_NAME, MD5Util.md5Hex(email)), null,

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

@@ -2,17 +2,15 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.j256.ormlite.dao.Dao;
-import com.j256.ormlite.dao.GenericRawResults;
-import com.j256.ormlite.dao.RawRowMapper;
 import com.j256.ormlite.dao.RuntimeExceptionDao;
 import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.stmt.SelectArg;
 import com.j256.ormlite.table.DatabaseTable;
 import com.zulip.android.ZulipApp;
 import com.zulip.android.util.ZLog;
 
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.Comparator;
@@ -30,8 +28,8 @@ public class Person {
     public static final String ISACTIVE_FIELD = "isActive";
     private static final String ID_FIELD = "id";
     private static final String AVATARURL_FIELD = "avatarUrl";
-    @SerializedName("IGNORE_MASK")
-    @DatabaseField(columnName = ID_FIELD, generatedId = true)
+    @SerializedName("user_id")
+    @DatabaseField(columnName = ID_FIELD, id = true)
     protected int id;
 
     @SerializedName("full_name")
@@ -104,36 +102,13 @@ public static Person getByEmail(ZulipApp app, String email) {
     @SuppressWarnings("WeakerAccess")
     public static Person getByEmail(Dao<Person, ?> dao, String email) {
         try {
-            // Using raw query to avoid errors with queryBuilder in ormlite.
-            // Listing of column names is necessary to avoid haphazard ordering of attributes
-            // in rawResults.
-            GenericRawResults<Person> rawResults =
-                    dao.queryRaw(
-                            "select " + Person.ID_FIELD + "," + Person.NAME_FIELD + ","
-                                    + Person.EMAIL_FIELD + "," + Person.AVATARURL_FIELD + ","
-                                    + Person.ISBOT_FIELD + "," + Person.ISACTIVE_FIELD + " from " + "people"
-                                    + " where " + Person.EMAIL_FIELD + " = ? ;",
-                            new RawRowMapper<Person>() {
-                                public Person mapRow(String[] columnNames,
-                                                     String[] resultColumns) {
-                                    return new Person(Integer.parseInt(resultColumns[0]),
-                                            resultColumns[1], resultColumns[2], resultColumns[3],
-                                            Boolean.parseBoolean(resultColumns[4]),
-                                            Boolean.parseBoolean(resultColumns[5]));
-                                }
-                            }, email.toLowerCase(Locale.US));
-
-            // we only care about the first result
-            Person returnValue = rawResults.getFirstResult();
-            rawResults.close();
-            return returnValue;
+            return dao.queryBuilder().where()
+                    .eq(Person.EMAIL_FIELD, new SelectArg(email.toLowerCase()))
+                    .queryForFirst();
         } catch (SQLException e) {
             throw new RuntimeException(e);
-        } catch (IOException e) {
-            ZLog.logException(e);
         }
 
-        return null;
     }
 
     @SuppressWarnings("WeakerAccess")

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

@@ -189,14 +189,11 @@ public Void call() throws Exception {
                         Person person = people.get(i);
                         person.setActive(true);
                         try {
-                            // Ormlite uses a query-by-id to see if it needs to update
-                            // or create a new row using createOrUpdate()
-                            // Hence, the object passed should always have an id.
-                            if (Person.getByEmail(app, person.getEmail()) == null) {
-                                personDao.create(person);
-                            } else {
-                                personDao.update(person);
+                            if (person.getEmail().equalsIgnoreCase(app.getYou().getEmail())) {
+                                // change the id
+                                personDao.updateId(app.getYou(), person.getId());
                             }
+                            personDao.createOrUpdate(person);
                         } catch (Exception e) {
                             ZLog.logException(e);
                         }