Browse Source

small fixes so i can test

1. left users are users not ids
2. null guard (crash)
3. arbitrary fix for layout issue
renovate/org.robolectric-robolectric-4.x
Austin Huang 4 years ago
parent
commit
47e8645dea
No known key found for this signature in database GPG Key ID: 84C23AA04587A91F
  1. 2
      app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
  2. 6
      app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectThread.java
  3. 1
      app/src/main/res/layout/layout_dm_base.xml

2
app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java

@ -69,7 +69,7 @@ public final class DirectItemsAdapter extends RecyclerView.Adapter<RecyclerView.
if (bothHeaders) { if (bothHeaders) {
return oldItem.date.equals(newItem.date); return oldItem.date.equals(newItem.date);
} }
if (oldItem.item != null && newItem.item != null) {
if (oldItem.item != null && oldItem.item.getClientContext() != null && newItem.item != null) {
return oldItem.item.getClientContext().equals(newItem.item.getClientContext()); return oldItem.item.getClientContext().equals(newItem.item.getClientContext());
} }
return false; return false;

6
app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectThread.java

@ -10,7 +10,7 @@ public class DirectThread {
private final String threadId; private final String threadId;
private final String threadV2Id; private final String threadV2Id;
private final List<DirectUser> users; private final List<DirectUser> users;
private final List<String> leftUsers;
private final List<DirectUser> leftUsers;
private final List<String> adminUserIds; private final List<String> adminUserIds;
private final List<DirectItem> items; private final List<DirectItem> items;
private final long lastActivityAt; private final long lastActivityAt;
@ -42,7 +42,7 @@ public class DirectThread {
public DirectThread(final String threadId, public DirectThread(final String threadId,
final String threadV2Id, final String threadV2Id,
final List<DirectUser> users, final List<DirectUser> users,
final List<String> leftUsers,
final List<DirectUser> leftUsers,
final List<String> adminUserIds, final List<String> adminUserIds,
final List<DirectItem> items, final List<DirectItem> items,
final long lastActivityAt, final long lastActivityAt,
@ -115,7 +115,7 @@ public class DirectThread {
return users; return users;
} }
public List<String> getLeftUsers() {
public List<DirectUser> getLeftUsers() {
return leftUsers; return leftUsers;
} }

1
app/src/main/res/layout/layout_dm_base.xml

@ -123,6 +123,7 @@
app:layout_constraintStart_toEndOf="@id/ivProfilePic" app:layout_constraintStart_toEndOf="@id/ivProfilePic"
app:layout_constraintTop_toBottomOf="@id/tvUsername" app:layout_constraintTop_toBottomOf="@id/tvUsername"
app:layout_constraintWidth_min="wrap" app:layout_constraintWidth_min="wrap"
app:layout_constraintWidth_max="230dp"
app:viewPartInfo="@id/message_info" app:viewPartInfo="@id/message_info"
app:viewPartMain="@id/message"> app:viewPartMain="@id/message">

Loading…
Cancel
Save