github-starred/gitnex
2
0
Fork 0
mirror of https://github.com/gitnex-org/gitnex.git synced 2026-07-16 01:50:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on commits

Browse Source
This commit is contained in:
M M Arif
2022-03-09 16:26:12 +05:00
parent 293d1162b1
commit dea334235d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
View File

@@ -17,6 +17,7 @@ import org.mian.gitnex.helpers.AppUtil;
import org.mian.gitnex.helpers.RoundedTransformation;
import org.mian.gitnex.helpers.TimeHelper;
import java.util.List;
import java.util.Objects;
/**
* Author M M Arif
@@ -117,22 +118,22 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
commitBody.setVisibility(View.GONE);
}
if(commitsModel.getCommitter().getId() != commitsModel.getAuthor().getId()) {
if(!Objects.equals(commitsModel.getCommit().getCommitter().getEmail(), commitsModel.getCommit().getAuthor().getEmail())) {
commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(context
.getString(R.string.commitAuthoredByAndCommittedByWhen, commitsModel.getAuthor().getUsername(), commitsModel.getCommitter().getUsername(),
.getString(R.string.commitAuthoredByAndCommittedByWhen, commitsModel.getCommit().getAuthor().getName(), commitsModel.getCommit().getCommitter().getName(),
TimeHelper
.formatTime(commitsModel.getCommit().getCommitter().getDate(), context.getResources().getConfiguration().locale, "pretty",
context)), HtmlCompat.FROM_HTML_MODE_COMPACT));
} else {
commitAuthorAndCommitter.setText(HtmlCompat.fromHtml(context
.getString(R.string.commitCommittedByWhen, commitsModel.getCommitter().getUsername(),
.getString(R.string.commitCommittedByWhen, commitsModel.getCommit().getCommitter().getName(),
TimeHelper
.formatTime(commitsModel.getCommit().getCommitter().getDate(), context.getResources().getConfiguration().locale, "pretty",
context)), HtmlCompat.FROM_HTML_MODE_COMPACT));
}
if(commitsModel.getAuthor().getAvatar_url() != null &&
if(commitsModel.getAuthor() != null && commitsModel.getAuthor().getAvatar_url() != null &&
!commitsModel.getAuthor().getAvatar_url().isEmpty()) {
commitAuthorAvatar.setVisibility(View.VISIBLE);
@@ -151,7 +152,8 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
commitAuthorAvatar.setVisibility(View.GONE);
}
if(!commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin()) &&
if(commitsModel.getCommitter() != null &&
!commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin()) &&
commitsModel.getCommitter().getAvatar_url() != null &&
!commitsModel.getCommitter().getAvatar_url().isEmpty()) {