Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-09-28 21:57:30 +00:00
Code Issues Releases Wiki Activity

Null checks. Fixes austinhuang0131/barinsta#1221

Browse Source
This commit is contained in:
Ammar Githam 2021-05-10 21:45:43 +09:00
parent 1c5bdb1cca
commit f3d5678225
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/awais/instagrabber/utils/DMUtils.java
View File

@ -13,6 +13,7 @@ import java.util.Optional;
import awais.instagrabber.R; import awais.instagrabber.R;
import awais.instagrabber.models.enums.DirectItemType; import awais.instagrabber.models.enums.DirectItemType;
import awais.instagrabber.models.enums.MediaItemType; import awais.instagrabber.models.enums.MediaItemType;
import awais.instagrabber.repositories.responses.Media;
import awais.instagrabber.repositories.responses.User; import awais.instagrabber.repositories.responses.User;
import awais.instagrabber.repositories.responses.directmessages.DirectItem; import awais.instagrabber.repositories.responses.directmessages.DirectItem;
import awais.instagrabber.repositories.responses.directmessages.DirectItemAnimatedMedia; import awais.instagrabber.repositories.responses.directmessages.DirectItemAnimatedMedia;
@ -57,7 +58,7 @@ public final class DMUtils {
read = true; read = true;
} else { } else {
final Map<Long, DirectThreadLastSeenAt> lastSeenAtMap = thread.getLastSeenAt(); final Map<Long, DirectThreadLastSeenAt> lastSeenAtMap = thread.getLastSeenAt();
read = isRead(item, lastSeenAtMap, Collections.singletonList(viewerId)); read = item != null && isRead(item, lastSeenAtMap, Collections.singletonList(viewerId));
} }
return read; return read;
} }
@ -88,7 +89,11 @@ public final class DMUtils {
message = item.getPlaceholder().getMessage(); message = item.getPlaceholder().getMessage();
break; break;
case MEDIA_SHARE: case MEDIA_SHARE:
final User mediaShareUser = item.getMediaShare().getUser(); final Media mediaShare = item.getMediaShare();
User mediaShareUser = null;
if (mediaShare != null) {
mediaShareUser = mediaShare.getUser();
}
subtitle = resources.getString(R.string.dms_inbox_shared_post, subtitle = resources.getString(R.string.dms_inbox_shared_post,
username != null ? username : "", username != null ? username : "",
mediaShareUser == null ? "" : mediaShareUser.getUsername()); mediaShareUser == null ? "" : mediaShareUser.getUsername());
@ -120,7 +125,11 @@ public final class DMUtils {
final int format = reelType.equals("highlight_reel") final int format = reelType.equals("highlight_reel")
? R.string.dms_inbox_shared_highlight ? R.string.dms_inbox_shared_highlight
: R.string.dms_inbox_shared_story; : R.string.dms_inbox_shared_story;
final User storyShareMediaUser = item.getStoryShare().getMedia().getUser(); final Media media = item.getStoryShare().getMedia();
User storyShareMediaUser = null;
if (media != null) {
storyShareMediaUser = media.getUser();
}
subtitle = resources.getString(format, subtitle = resources.getString(format,
username != null ? username : "", username != null ? username : "",
storyShareMediaUser == null ? "" : storyShareMediaUser.getUsername()); storyShareMediaUser == null ? "" : storyShareMediaUser.getUsername());
@ -137,13 +146,21 @@ public final class DMUtils {
subtitle = item.getVideoCallEvent().getDescription(); subtitle = item.getVideoCallEvent().getDescription();
break; break;
case CLIP: case CLIP:
final User clipUser = item.getClip().getClip().getUser(); final Media clip = item.getClip().getClip();
User clipUser = null;
if (clip != null) {
clipUser = clip.getUser();
}
subtitle = resources.getString(R.string.dms_inbox_shared_clip, subtitle = resources.getString(R.string.dms_inbox_shared_clip,
username != null ? username : "", username != null ? username : "",
clipUser == null ? "" : clipUser.getUsername()); clipUser == null ? "" : clipUser.getUsername());
break; break;
case FELIX_SHARE: case FELIX_SHARE:
final User felixShareVideoUser = item.getFelixShare().getVideo().getUser(); final Media video = item.getFelixShare().getVideo();
User felixShareVideoUser = null;
if (video != null) {
felixShareVideoUser = video.getUser();
}
subtitle = resources.getString(R.string.dms_inbox_shared_igtv, subtitle = resources.getString(R.string.dms_inbox_shared_igtv,
username != null ? username : "", username != null ? username : "",
felixShareVideoUser == null ? "" : felixShareVideoUser.getUsername()); felixShareVideoUser == null ? "" : felixShareVideoUser.getUsername());