From dea334235db91c7f9e2c2bc21cdcb9b990d346dd Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Wed, 9 Mar 2022 16:26:12 +0500
Subject: [PATCH] Fix crash on commits

---
 .../org/mian/gitnex/adapters/CommitsAdapter.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
index 96d7831a..19668d23 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@@ -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()) {