Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Android] Fix missing feature registration issue #3038

Merged
merged 3 commits into from
Jun 21, 2019
Merged

[Android] Fix missing feature registration issue #3038

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b593b76
Fix missing feature registration issue
almedina-ms Jun 7, 2019
95486c2
Merge branch 'master' into user/almedina-ms/AndroidFixFeatureRegistra…
paulcam206 Jun 7, 2019
e003884
Merge branch 'master' into user/almedina-ms/AndroidFixFeatureRegistra…
almedina-ms Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e/android/adaptivecards/src/main/java/io/adaptivecards/renderer/ActionLayoutRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ecards/src/main/java/io/adaptivecards/renderer/registration/CardRendererRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ else if(tag instanceof AdaptiveCard)
throw new AdaptiveFallbackException(cardElement);
}

if (!cardElement.MeetsRequirements(featureRegistration))
if ((featureRegistration != null) && (!cardElement.MeetsRequirements(featureRegistration)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a unit test for this in the suite you are adding?

{
throw new AdaptiveFallbackException(cardElement, featureRegistration);
}
Expand Down