From d4cee009cf1e72ddb714b155eaba880e29448f49 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 6 Jun 2018 16:01:52 +0200 Subject: [PATCH] Try to fix another crash Signed-off-by: Mario Danic --- .../com/nextcloud/talk/models/database/User.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/database/User.java b/app/src/main/java/com/nextcloud/talk/models/database/User.java index 0a6440520..ff009bb42 100644 --- a/app/src/main/java/com/nextcloud/talk/models/database/User.java +++ b/app/src/main/java/com/nextcloud/talk/models/database/User.java @@ -62,15 +62,17 @@ public interface User extends Parcelable, Persistable, Serializable { boolean getScheduledForDeletion(); default boolean hasSpreedCapabilityWithName(String capabilityName) { - try { - Capabilities capabilities = LoganSquare.parse(this.getCapabilities(), Capabilities.class); - if (capabilities.getSpreedCapability() != null && capabilities.getSpreedCapability().getFeatures() != null) { - return capabilities.getSpreedCapability().getFeatures().contains(capabilityName); + if (getCapabilities() != null) { + try { + Capabilities capabilities = LoganSquare.parse(getCapabilities(), Capabilities.class); + if (capabilities.getSpreedCapability() != null && capabilities.getSpreedCapability().getFeatures() != null) { + return capabilities.getSpreedCapability().getFeatures().contains(capabilityName); + } + } catch (IOException e) { + Log.e(TAG, "Failed to get capabilities for the user"); } - } catch (IOException e) { - Log.e(TAG, "Failed to get capabilities for the user"); } - return false; + } }