From 6697b065304c4115c0093329006b83e96cf64745 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 6 Jun 2016 12:07:38 -0300
Subject: [PATCH] Fix NPE in ForumSharingStatusActivity
by checking if a group ID exists.
Closes #430
---
.../android/contact/BaseContactListAdapter.java | 6 ++++--
.../briarproject/android/contact/ContactListAdapter.java | 1 -
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java b/briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java
index 1475608ec6..a784a9d909 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 63d978ff93..8c57c3cbf1 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;
--
GitLab