Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '430-npe-in-forumsharingstatusactivity' into 'master'

Browse Source 
Fix NPE in ForumSharingStatusActivity by only accessing group in contact list

Only access group in contact list where it is guaranteed to exist.

Closes #430

See merge request !211
This commit is contained in:
Torsten Grote
2016-06-08 13:49:09 +00:00
parent 1bb17a3979 6697b06530
commit e96838e731
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java
View File

@@ -52,8 +52,10 @@ public abstract class BaseContactListAdapter<VH extends BaseContactListAdapter.B
} }
}); });
ViewCompat.setTransitionName(ui.avatar, "avatar" + if (item.getGroupId() != null) {
StringUtils.toHexString(item.getGroupId().getBytes())); ViewCompat.setTransitionName(ui.avatar, "avatar" +
StringUtils.toHexString(item.getGroupId().getBytes()));
}
} }
@Override @Override

1
briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
View File

@@ -1,7 +1,6 @@
package org.briarproject.android.contact; package org.briarproject.android.contact;
import android.content.Context; import android.content.Context;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;