From 062fb9e9fd3d03cd89e338ac0c58070b426a4adc Mon Sep 17 00:00:00 2001
From: qwerty287 <qwerty287@noreply.codeberg.org>
Date: Sun, 27 Mar 2022 11:58:33 +0200
Subject: [PATCH] Fix commit crash (#1096)

Fixes another null pointer crash on commits. You can try this on our emoji-java fork, it will crash on `main`.

Co-authored-by: qwerty287 <ndev@web.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1096
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
Co-authored-by: qwerty287 <qwerty287@noreply.codeberg.org>
Co-committed-by: qwerty287 <qwerty287@noreply.codeberg.org>
---
 app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java | 3 +--
 .../java/org/mian/gitnex/fragments/CommitDetailFragment.java   | 2 +-
 2 files changed, 2 insertions(+), 3 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 803d6b19..41c2abb6 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@@ -125,7 +125,6 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 			            TimeHelper
 				            .formatTime(commitsModel.getCommit().getCommitter().getDate(), context.getResources().getConfiguration().locale, "pretty",
 					            context)), HtmlCompat.FROM_HTML_MODE_COMPACT));
-
             }
 
 	        if(commitsModel.getAuthor() != null && commitsModel.getAuthor().getAvatar_url() != null &&
@@ -148,7 +147,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 	        }
 
             if(commitsModel.getCommitter() != null &&
-				!commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin()) &&
+	            (commitsModel.getAuthor() == null || !commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin())) &&
 	            commitsModel.getCommitter().getAvatar_url() != null &&
 	            !commitsModel.getCommitter().getAvatar_url().isEmpty()) {
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
index 78d1bf6b..25c95c28 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
@@ -195,7 +195,7 @@ public class CommitDetailFragment extends Fragment {
 					}
 
 					if(commitsModel.getCommitter() != null &&
-						!commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin()) &&
+						(commitsModel.getAuthor() == null || !commitsModel.getAuthor().getLogin().equals(commitsModel.getCommitter().getLogin())) &&
 						commitsModel.getCommitter().getAvatar_url() != null &&
 						!commitsModel.getCommitter().getAvatar_url().isEmpty()) {