From 7dd4897c8cf13fefd0476cd5df66f99340abbd0a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 28 Feb 2019 15:16:36 -0300
Subject: [PATCH] [android] small improvements for contact list

---
 .../briar/android/contact/BaseContactListAdapter.java |  5 ++---
 .../briar/android/contact/ContactListAdapter.java     | 11 ++++++-----
 .../briar/android/contact/ContactListFragment.java    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java
index 5e58597ce..779091d0c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java
@@ -38,7 +38,7 @@ public abstract class BaseContactListAdapter<I extends ContactItem, VH extends C
 
 	@Override
 	public boolean areItemsTheSame(I c1, I c2) {
-		return c1.getContact().getId().equals(c2.getContact().getId());
+		return c1.getContact().equals(c2.getContact());
 	}
 
 	@Override
@@ -47,8 +47,7 @@ public abstract class BaseContactListAdapter<I extends ContactItem, VH extends C
 	}
 
 	int findItemPosition(ContactId c) {
-		int count = getItemCount();
-		for (int i = 0; i < count; i++) {
+		for (int i = 0; i < getItemCount(); i++) {
 			I item = getItemAt(i);
 			if (item != null && item.getContact().getId().equals(c))
 				return i;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java
index 5eb17f743..0c8cf5e12 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListAdapter.java
@@ -5,8 +5,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 
+@NotNullByDefault
 public class ContactListAdapter extends
 		BaseContactListAdapter<ContactListItem, ContactListItemViewHolder> {
 
@@ -28,6 +30,9 @@ public class ContactListAdapter extends
 	public boolean areContentsTheSame(ContactListItem c1, ContactListItem c2) {
 		// check for all properties that influence visual
 		// representation of contact
+		if (c1.isEmpty() != c2.isEmpty()) {
+			return false;
+		}
 		if (c1.getUnreadCount() != c2.getUnreadCount()) {
 			return false;
 		}
@@ -39,11 +44,7 @@ public class ContactListAdapter extends
 
 	@Override
 	public int compare(ContactListItem c1, ContactListItem c2) {
-		long time1 = c1.getTimestamp();
-		long time2 = c2.getTimestamp();
-		if (time1 < time2) return 1;
-		if (time1 > time2) return -1;
-		return 0;
+		return Long.compare(c2.getTimestamp(), c1.getTimestamp());
 	}
 
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
index 73df44e49..ac42f3bce 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
@@ -281,7 +281,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 			ContactListItem item = adapter.getItemAt(position);
 			if (item != null) {
 				item.setConnected(connected);
-				adapter.notifyItemChanged(position);
+				adapter.updateItemAt(position, item);
 			}
 		});
 	}