From d7562f9511742aaeb7266faf8aa39cede142cfd8 Mon Sep 17 00:00:00 2001
From: Kosh <kosh20111@gmail.com>
Date: Thu, 2 Mar 2017 22:52:14 +0800
Subject: [PATCH] fixed closedBy and closedAt where they are not displayed
 properly.

---
 .../ui/adapter/viewholder/IssuesViewHolder.java     |  4 +---
 .../repos/issues/issue/details/IssuePagerView.java  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java
index 96945202..03d4a4e3 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java
@@ -44,9 +44,7 @@ public class IssuesViewHolder extends BaseViewHolder<IssueModel> {
                                                            ? issueModel.getCreatedAt() : issueModel.getClosedAt());
             details.setText(SpannableBuilder.builder()
                     .append(itemView.getResources().getString(issueModel.getState().getStatus()))
-                    .append(" ").append(by).append(" ")
-                    .append(issueModel.getState() == IssueState.closed
-                            ? issueModel.getClosedBy().getLogin() : issueModel.getUser().getLogin()).append(" ")
+                    .append(" ")
                     .append(data));
         }
         if (withAvatar) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerView.java
index a24099f8..7b2ac62a 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerView.java
@@ -181,9 +181,18 @@ public class IssuePagerView extends BaseActivity<IssuePagerMvp.View, IssuePagerP
         title.setText(issueModel.getTitle());
         if (userModel != null) {
             size.setVisibility(View.GONE);
+            String username;
+            CharSequence parsedDate;
+            if (issueModel.getState() == IssueState.closed) {
+                username = issueModel.getClosedBy() != null ? issueModel.getClosedBy().getLogin() : "N/A";
+                parsedDate = issueModel.getClosedAt() != null ? ParseDateFormat.getTimeAgo(issueModel.getClosedAt()) : "N/A";
+            } else {
+                parsedDate = ParseDateFormat.getTimeAgo(issueModel.getCreatedAt());
+                username = issueModel.getUser() != null ? issueModel.getUser().getLogin() : "N/A";
+            }
             date.setText(SpannableBuilder.builder().append(getString(issueModel.getState().getStatus()))
-                    .append(" ").append(getString(R.string.by)).append(" ").append(userModel.getLogin()).append(" ")
-                    .append(ParseDateFormat.getTimeAgo(issueModel.getCreatedAt())));
+                    .append(" ").append(getString(R.string.by)).append(" ").append(username).append(" ")
+                    .append(parsedDate));
             avatarLayout.setUrl(userModel.getAvatarUrl(), userModel.getLogin());
         }
         pager.setAdapter(new FragmentsPagerAdapter(getSupportFragmentManager(), FragmentPagerAdapterModel.buildForIssues(this, issueModel)));