From b593b7692bce8650c830e30af2a358a793bc33ed Mon Sep 17 00:00:00 2001 From: Alberto Medina Gutierrez Date: Fri, 7 Jun 2019 10:31:02 -0700 Subject: [PATCH] Fix missing feature registration issue --- .../java/io/adaptivecards/renderer/ActionLayoutRenderer.java | 2 +- .../renderer/registration/CardRendererRegistration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/ActionLayoutRenderer.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/ActionLayoutRenderer.java index e14b77799f..38f0e25d45 100644 --- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/ActionLayoutRenderer.java +++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/ActionLayoutRenderer.java @@ -144,7 +144,7 @@ else if (alignment == ActionAlignment.Center.swigValue()) throw new AdaptiveFallbackException(actionElement); } - if (!actionElement.MeetsRequirements(featureRegistration)) + if ((featureRegistration != null) && (!actionElement.MeetsRequirements(featureRegistration))) { throw new AdaptiveFallbackException(actionElement, featureRegistration); } diff --git a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/registration/CardRendererRegistration.java b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/registration/CardRendererRegistration.java index 1f9d50cd0b..679a056922 100644 --- a/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/registration/CardRendererRegistration.java +++ b/source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/registration/CardRendererRegistration.java @@ -277,7 +277,7 @@ else if(tag instanceof AdaptiveCard) throw new AdaptiveFallbackException(cardElement); } - if (!cardElement.MeetsRequirements(featureRegistration)) + if ((featureRegistration != null) && (!cardElement.MeetsRequirements(featureRegistration))) { throw new AdaptiveFallbackException(cardElement, featureRegistration); }