Skip to content

[Android] Add validation for empty data in submit actions #3193

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

Merged
almedina-ms merged 5 commits into from
Aug 26, 2019
Merged

[Android] Add validation for empty data in submit actions #3193

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
569558f
Add validation for empty data in submit actions
almedina-ms Jul 11, 2019
9408fc0
Merge branch 'master' into user/almedina-ms/AndroidFixMobileAppsForEm…
almedina-ms Jul 16, 2019
7fafa71
Change JSONObject initialization
almedina-ms Jul 16, 2019
1c1c9a2
Merge branch 'user/almedina-ms/AndroidFixMobileAppsForEmptyJsons' of …
almedina-ms Jul 16, 2019
fc83a72
Merge branch 'master' into user/almedina-ms/AndroidFixMobileAppsForEm…
almedina-ms Aug 26, 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
18 changes: 15 additions & 3 deletions ...e/src/main/java/io/adaptivecards/adaptivecardssample/MainActivityAdaptiveCardsSample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,10 +766,22 @@ private void onSubmit(BaseActionElement actionElement, RenderedAdaptiveCard rend
Map<String, String> keyValueMap = renderedAdaptiveCard.getInputs();
if (!data.isEmpty())
{
try {
JSONObject object = new JSONObject(data);
try
{
JSONObject object = null;
if (!data.equals("null\n"))
{
object = new JSONObject(data);
}
else
{
object = new JSONObject();
}

showToast("Submit data: " + object.toString() + "\nInput: " + keyValueMap.toString(), Toast.LENGTH_LONG);
} catch (JSONException e) {
}
catch (JSONException e)
{
showToast(e.toString(), Toast.LENGTH_LONG);
}
}
Expand Down
26 changes: 20 additions & 6 deletions source/android/mobilechatapp/src/main/java/com/example/mobilechatapp/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,22 +263,36 @@ public void run()
this.runOnUiThread(new RunnableExtended(this, text, duration));
}

private void onSubmit(BaseActionElement actionElement, RenderedAdaptiveCard renderedAdaptiveCard) {
private void onSubmit(BaseActionElement actionElement, RenderedAdaptiveCard renderedAdaptiveCard)
{
SubmitAction submitAction = null;
if (actionElement instanceof SubmitAction) {
if (actionElement instanceof SubmitAction)
{
submitAction = (SubmitAction) actionElement;
} else if ((submitAction = SubmitAction.dynamic_cast(actionElement)) == null) {
}
else if ((submitAction = SubmitAction.dynamic_cast(actionElement)) == null)
{
throw new InternalError("Unable to convert BaseActionElement to ShowCardAction object model.");
}

String data = submitAction.GetDataJson();
Map<String, String> keyValueMap = renderedAdaptiveCard.getInputs();
if (!data.isEmpty())
{
try {
JSONObject object = new JSONObject(data);
try
{
JSONObject object = null;
if (!data.equals("null\n"))

@RebeccaAnne RebeccaAnne Jul 12, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

null\n [](start = 34, length = 6)

Where is this string coming from? Is getting this string the expected behavior or should the shared model be doing something better? If we have to do this, third parties would too, and it seems like a bad experience.

@almedina-ms almedina-ms Jul 16, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

that string is coming from the shared model

{
object = new JSONObject(data);
}
else
{
object = new JSONObject();
}
showToast("Submit data: " + object.toString() + "\nInput: " + keyValueMap.toString(), Toast.LENGTH_LONG);
} catch (JSONException e) {
}
catch (JSONException e) {
showToast(e.toString(), Toast.LENGTH_LONG);
}
}
Expand Down