From bc7805c142f184347b3f230de894232f756ae948 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Fri, 1 Jul 2016 18:50:19 +0300 Subject: getPersonFromCursor creates person per table --- .../wordpress/android/datasets/PeopleTable.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'WordPress/src/main/java/org/wordpress/android/datasets/PeopleTable.java') diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/PeopleTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/PeopleTable.java index 88deeaf57..6f4f59d22 100644 --- a/WordPress/src/main/java/org/wordpress/android/datasets/PeopleTable.java +++ b/WordPress/src/main/java/org/wordpress/android/datasets/PeopleTable.java @@ -234,18 +234,24 @@ public class PeopleTable { private static Person getPersonFromCursor(Cursor c, String table, int localTableBlogId) { long personId = c.getInt(c.getColumnIndex("person_id")); - String blogId = c.getString(c.getColumnIndex("blog_id")); - Person person = new Person(personId, blogId, localTableBlogId); - person.setUsername(c.getString(c.getColumnIndex("user_name"))); + Person person = new Person(personId, localTableBlogId); person.setDisplayName(c.getString(c.getColumnIndex("display_name"))); person.setAvatarUrl(c.getString(c.getColumnIndex("avatar_url"))); - person.setRole(c.getString(c.getColumnIndex("role"))); - person.setSubscribed(c.getString(c.getColumnIndex("subscribed"))); - if (table.equals(FOLLOWERS_TABLE)) { - person.setFollower(true); - } else if (table.equals(EMAIL_FOLLOWERS_TABLE)) { - person.setEmailFollower(true); + switch (table) { + case TEAM_TABLE: + person.setUsername(c.getString(c.getColumnIndex("user_name"))); + person.setRole(c.getString(c.getColumnIndex("role"))); + break; + case FOLLOWERS_TABLE: + person.setUsername(c.getString(c.getColumnIndex("user_name"))); + person.setSubscribed(c.getString(c.getColumnIndex("subscribed"))); + person.setFollower(true); + break; + case EMAIL_FOLLOWERS_TABLE: + person.setSubscribed(c.getString(c.getColumnIndex("subscribed"))); + person.setEmailFollower(true); + break; } return person; -- cgit v1.2.3