Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 08b3508

Browse files
committed
Set stream objects to null for private messages.
1 parent dc1f4e0 commit 08b3508

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public String getDisplayRecipient(ZulipApp app) {
353353
ArrayList<String> names = new ArrayList<>();
354354

355355
for (Person person : people) {
356-
if (person.id != app.getYou().id || people.length == 1) {
356+
if (!person.getEmail().equals(app.getYou().getEmail()) || people.length == 1) {
357357
names.add(person.getName());
358358
}
359359
}
@@ -419,7 +419,10 @@ public Void call() throws Exception {
419419
for (Message m : messages) {
420420
Person person = Person.getOrUpdate(app, m.getSenderEmail(), m.getSenderFullName(), m.getAvatarUrl());
421421
m.setSender(person);
422-
Stream stream = Stream.getByName(app, m.getRecipients());
422+
Stream stream = null;
423+
if (m.getType() == MessageType.STREAM_MESSAGE) {
424+
stream = Stream.getByName(app, m.getRecipients());
425+
}
423426
m.setStream(stream);
424427
messageDao.createOrUpdate(m);
425428
}

0 commit comments

Comments
 (0)