From 001f5faeaa1ca515ef6d0b27a16bc7ec860bef16 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 7 Dec 2016 14:49:57 -0200
Subject: [PATCH] Two small review details: comment and initializing boolean
---
.../org/briarproject/briar/android/contact/ContactItem.java | 2 +-
.../briar/android/contact/ContactItemViewHolder.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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 703835a3bc..e2e5f03510 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 3b543a19ee..33cf42232e 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);
}
--
GitLab