mirror of
https://github.com/gitnex-org/gitnex.git
synced 2026-07-10 08:50:59 -05:00
Fix showing labels twice
This commit is contained in:
@@ -170,6 +170,7 @@ public class IssueDetailActivity extends BaseActivity
|
|||||||
private int loadingFinished = 0;
|
private int loadingFinished = 0;
|
||||||
private MentionHelper mentionHelper;
|
private MentionHelper mentionHelper;
|
||||||
private boolean pullRequestFetchAttempted = false;
|
private boolean pullRequestFetchAttempted = false;
|
||||||
|
private boolean issueInitialized = false;
|
||||||
|
|
||||||
private enum Mode {
|
private enum Mode {
|
||||||
EDIT,
|
EDIT,
|
||||||
@@ -1094,6 +1095,11 @@ public class IssueDetailActivity extends BaseActivity
|
|||||||
|
|
||||||
private void initWithIssue() {
|
private void initWithIssue() {
|
||||||
|
|
||||||
|
if (issueInitialized) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
issueInitialized = true;
|
||||||
|
|
||||||
if (!issue.getRepository().hasRepository()) {
|
if (!issue.getRepository().hasRepository()) {
|
||||||
getRepoInfo();
|
getRepoInfo();
|
||||||
} else {
|
} else {
|
||||||
@@ -1564,7 +1570,7 @@ public class IssueDetailActivity extends BaseActivity
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void checkAndInitWithIssue() {
|
private void checkAndInitWithIssue() {
|
||||||
if (loadingFinishedIssue || pullRequestFetchAttempted) {
|
if ((loadingFinishedIssue || pullRequestFetchAttempted) && !issueInitialized) {
|
||||||
initWithIssue();
|
initWithIssue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,13 +175,14 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
|
|||||||
type,
|
type,
|
||||||
ColorStateList.valueOf(
|
ColorStateList.valueOf(
|
||||||
context.getResources()
|
context.getResources()
|
||||||
.getColor(R.color.iconIssuePrClosedColor)));
|
.getColor(R.color.iconIssuePrClosedColor, null)));
|
||||||
break;
|
break;
|
||||||
case "merged":
|
case "merged":
|
||||||
ImageViewCompat.setImageTintList(
|
ImageViewCompat.setImageTintList(
|
||||||
type,
|
type,
|
||||||
ColorStateList.valueOf(
|
ColorStateList.valueOf(
|
||||||
context.getResources().getColor(R.color.iconPrMergedColor)));
|
context.getResources()
|
||||||
|
.getColor(R.color.iconPrMergedColor, null)));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in New Issue
Block a user