diff options
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/view/adapter')
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/view/adapter/MessageListAdapter.java | 10 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/MessageListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/MessageListAdapter.java index b521e236..f9731a94 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/MessageListAdapter.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/MessageListAdapter.java @@ -43,11 +43,11 @@ public class MessageListAdapter extends CustomListAdapter<MessageViewModel> { // --------------------- GETTER / SETTER METHODS --------------------- public long getLastID() { - return ((MessageViewModel) getItem(getCount() - 1)).getID(); + return ((MessageViewModel) getItem(getCount() - 1)).getDirectMessage().getId(); } public long getTopID() { - return ((MessageViewModel) getItem(0)).getID(); + return ((MessageViewModel) getItem(0)).getDirectMessage().getId(); } // ------------------------ OVERRIDE METHODS ------------------------ @@ -78,7 +78,7 @@ public class MessageListAdapter extends CustomListAdapter<MessageViewModel> { Collections.sort(list, new Comparator<MessageViewModel>() { @Override public int compare(MessageViewModel lhs, MessageViewModel rhs) { - return rhs.getCreatedAt().compareTo(lhs.getCreatedAt()); + return rhs.getDirectMessage().getCreatedAt().compareTo(lhs.getDirectMessage().getCreatedAt()); } }); } @@ -91,7 +91,7 @@ public class MessageListAdapter extends CustomListAdapter<MessageViewModel> { Iterator<MessageViewModel> iterator = this.list.iterator(); while (iterator.hasNext()) { MessageViewModel message = iterator.next(); - if (message.getID() == messageID) { + if (message.getDirectMessage().getId() == messageID) { iterator.remove(); return message; } @@ -101,7 +101,7 @@ public class MessageListAdapter extends CustomListAdapter<MessageViewModel> { } private boolean preAdd(MessageViewModel item) { - removeByMessageID(item.getID()); + removeByMessageID(item.getDirectMessage().getId()); return true; } } diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java index ece2eea8..e69e5214 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java @@ -26,7 +26,7 @@ package net.lacolaco.smileessence.view.adapter; import android.app.Activity; -import net.lacolaco.smileessence.data.UserCache; +import net.lacolaco.smileessence.entity.MuteUserIds; import net.lacolaco.smileessence.viewmodel.StatusViewModel; import java.util.Collections; @@ -44,11 +44,11 @@ public class StatusListAdapter extends CustomListAdapter<StatusViewModel> { // --------------------- GETTER / SETTER METHODS --------------------- public long getLastID() { - return ((StatusViewModel) getItem(getCount() - 1)).getID(); + return ((StatusViewModel) getItem(getCount() - 1)).getTweet().getId(); } public long getTopID() { - return ((StatusViewModel) getItem(0)).getID(); + return ((StatusViewModel) getItem(0)).getTweet().getId(); } // ------------------------ OVERRIDE METHODS ------------------------ @@ -82,7 +82,7 @@ public class StatusListAdapter extends CustomListAdapter<StatusViewModel> { Collections.sort(list, new Comparator<StatusViewModel>() { @Override public int compare(StatusViewModel lhs, StatusViewModel rhs) { - return Long.valueOf(rhs.getID()).compareTo(lhs.getID()); + return Long.valueOf(rhs.getTweet().getId()).compareTo(lhs.getTweet().getId()); } }); } @@ -95,7 +95,7 @@ public class StatusListAdapter extends CustomListAdapter<StatusViewModel> { Iterator<StatusViewModel> iterator = this.list.iterator(); while (iterator.hasNext()) { StatusViewModel statusViewModel = iterator.next(); - if (statusViewModel.getID() == statusID || statusViewModel.getOriginal().getID() == statusID) { + if (statusViewModel.getTweet().getOriginalTweet().getId() == statusID) { iterator.remove(); } } @@ -103,11 +103,11 @@ public class StatusListAdapter extends CustomListAdapter<StatusViewModel> { } private boolean isBlockUser(StatusViewModel item) { - return UserCache.getInstance().isInvisibleUserID(item.getOriginalUserID()); + return MuteUserIds.isMuted(item.getTweet().getOriginalTweet().getUser().getId()); } private boolean preAdd(StatusViewModel item) { - removeByStatusID(item.getID()); + removeByStatusID(item.getTweet().getId()); return !isBlockUser(item); } } |