diff --git a/briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java b/briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java index 1475608ec6d7de320a54b8345441294272ccdac2..a784a9d909ded6e5b72a36965f0493478ab5f362 100644 --- a/briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java +++ b/briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java @@ -52,8 +52,10 @@ public abstract class BaseContactListAdapter<VH extends BaseContactListAdapter.B } }); - ViewCompat.setTransitionName(ui.avatar, "avatar" + - StringUtils.toHexString(item.getGroupId().getBytes())); + if (item.getGroupId() != null) { + ViewCompat.setTransitionName(ui.avatar, "avatar" + + StringUtils.toHexString(item.getGroupId().getBytes())); + } } @Override diff --git a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java index 63d978ff934b1517124e965805550c04029c29a8..8c57c3cbf1e0d753cf0ed36c2aadce87a64ff65f 100644 --- a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java +++ b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java @@ -1,7 +1,6 @@ package org.briarproject.android.contact; import android.content.Context; -import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewCompat; import android.text.format.DateUtils; import android.view.LayoutInflater;