diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index 59f6c5e0..762484d4 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -1119,25 +1119,7 @@ public class IssueDetailActivity extends BaseActivity viewBinding.statusesLvMain.setVisibility(View.VISIBLE); getStatuses(); - - viewBinding.prInfoLayout.setVisibility(View.VISIBLE); - String displayName; - User user = issue.getIssue().getUser(); - if (user != null && user.getFullName() != null && !user.getFullName().isEmpty()) { - displayName = user.getFullName(); - } else { - displayName = user != null && user.getLogin() != null ? user.getLogin() : "Unknown"; - } - - PullRequest pr = issue.getPullRequest(); - if (pr != null && pr.getHead() != null && pr.getBase() != null) { - viewBinding.prInfo.setText( - getString( - R.string.pr_info, - displayName, - pr.getHead().getRef(), - pr.getBase().getRef())); - } + updatePrInfo(); if (issue.getIssue().getPullRequest().isMerged()) { // merged @@ -1557,6 +1539,7 @@ public class IssueDetailActivity extends BaseActivity issue.setPullRequest(response.body()); loadingFinishedPr = true; updateMenuState(); + updatePrInfo(); } else { loadingFinishedPr = true; } @@ -1573,6 +1556,30 @@ public class IssueDetailActivity extends BaseActivity }); } + private void updatePrInfo() { + if (issue.getIssue() != null && issue.getIssue().getPullRequest() != null) { + PullRequest pr = issue.getPullRequest(); + if (pr != null && pr.getHead() != null && pr.getBase() != null) { + viewBinding.prInfoLayout.setVisibility(View.VISIBLE); + String displayName; + User user = issue.getIssue().getUser(); + if (user != null && user.getFullName() != null && !user.getFullName().isEmpty()) { + displayName = user.getFullName(); + } else { + displayName = + user != null && user.getLogin() != null ? user.getLogin() : "Unknown"; + } + + viewBinding.prInfo.setText( + getString( + R.string.pr_info, + displayName, + pr.getHead().getLabel(), + pr.getBase().getRef())); + } + } + } + private void checkAndInitWithIssue() { if ((loadingFinishedIssue || pullRequestFetchAttempted) && !issueInitialized) { initWithIssue();