From d6637f0455f3cc599d79d77f7b681fdeca141d4e Mon Sep 17 00:00:00 2001 From: Yakov Date: Mon, 3 Jul 2017 23:12:33 -0400 Subject: [PATCH] Fixes #732 --- .../provider/timeline/TimelineProvider.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java index 5130aa42..15eac268 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java @@ -64,13 +64,25 @@ public class TimelineProvider { .append(" ") .append(thisString); } + if (issueEventModel.getCommitId() != null) { + spannableBuilder + .append(" ") + .append(in) + .append(" ") + .url(substring(issueEventModel.getCommitId())); + + } } else if (event == IssueEventType.assigned || event == IssueEventType.unassigned) { spannableBuilder .append(" "); if (user != null && user.getLogin().equalsIgnoreCase(issueEventModel.getAssignee().getLogin())) { spannableBuilder.append("self-assigned this"); } else { - spannableBuilder.bold(issueEventModel.getAssignee().getLogin()); + spannableBuilder + .append(" ") + .append(context.getString(R.string.assigned)) + .append(" ") + .bold(issueEventModel.getAssignee().getLogin()); } } else { spannableBuilder.append(" ").append(event.name().replaceAll("_", " ")); @@ -102,14 +114,6 @@ public class TimelineProvider { .append(from) .append(" ") .bold(issueEventModel.getRequestedReviewer().getLogin()); - } else if (event == IssueEventType.closed) { - if (issueEventModel.getCommitId() != null) { - spannableBuilder - .append(" ") - .append(in) - .append(" ") - .url(substring(issueEventModel.getCommitId())); - } } spannableBuilder.append(" ").append(getDate(issueEventModel.getCreatedAt())); }