From 69756eb84a81683503282cc3621247540ce2fb0e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 12 Jun 2018 18:36:09 +0200 Subject: [PATCH] prevent NPE in divider decoration --- .../keychain/ui/util/recyclerview/DividerItemDecoration.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/DividerItemDecoration.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/DividerItemDecoration.java index d31243c40..7473f78e3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/DividerItemDecoration.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/DividerItemDecoration.java @@ -102,6 +102,11 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { @Override public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { + if (mDivider == null) { + outRect.set(0, 0, 0, 0); + return; + } + if (mOrientation == VERTICAL_LIST) { outRect.set(0, 0, 0, mDivider.getIntrinsicHeight()); } else {