diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java index 703835a3bcfcaade19eb3d845a6197faf7c32e7e..e2e5f03510c47264070554012d6fa188f03cf2b3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItem.java @@ -13,7 +13,7 @@ public class ContactItem { private boolean connected; public ContactItem(Contact contact) { - this.contact = contact; + this(contact, false); } public ContactItem(Contact contact, boolean connected) { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java index 3b543a19eeb6502453de0a523426c5d9b889342b..33cf42232e734d4ef6f7c500b1d29ab5e84ada26 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java @@ -32,6 +32,7 @@ public class ContactItemViewHolder<I extends ContactItem> layout = (ViewGroup) v; avatar = (ImageView) v.findViewById(R.id.avatarView); name = (TextView) v.findViewById(R.id.nameView); + // this can be null as not all layouts that use this ViewHolder have it bulb = (ImageView) v.findViewById(R.id.bulbView); }