Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

Commit

Permalink
Latest Android Updates (#1828)
Browse files Browse the repository at this point in the history
* blue background for users' requests in chat

* added demo feature to update widgets of 3rd party app

* added ISO 8601 timestamps to generated activity events

* pull from upstream (#11)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [SkillsLib]remove http transport and related (#1676)

* remove http transport and related

* try to get RestoreAddtionalProjectSources working

* trigger build

* add package source for Skills test project

* Android app update: Ability to change view between Full Conversation and Conversation (#1681)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* added feature to show full conversation

* latest upstream changes (#8)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [Botskills] Improve error messages (#1683)

* Improve error messages for more verbosity

* Continue improving error messages

* Finish improving error messages

* Improve error handling for authenticationUtils

* Revert changes to arguments arrays

* Add link to documentation when auth fails

* Allow ITriggers with nullable properties (#1685)

* [Botskills] Move location to tools folder (#1666)

* Move botskills cli tool to the tools root folder

* Update doc references

* Update yaml files

* Update package-lock file

* Update build.botskills.ts.ps1

* Update speechenablement.md

* [Botskills] Add re-publish warning (#1686)

* Add warning to republish VA after refresh

* Fix tests

* add flag to include nuget pkgs so nuspec can pick up packages needed (#1690)

* add flag to include nuget pkgs so nuspec can pick up packages needed

* force trigger build

* remove redundant space

* [VA] Updated deployment scripts to assign luis subscription key automatically (#1693)

* add luis sub key

* add azure account

* deploy updates

* deploy fix

* [Botskills] Update documentation (#1688)

* Update botskills documentation

* Remove style of botskills word

* Fix link reference

* Fix references to botskills documentation

* Fix typos

* Apply suggestions from code review

Co-Authored-By: David Favretto <david.favretto@southworks.com>

* Apply suggestions from code review

* upgrade versions of skills and solutions for templates (#1695)

* [TypeScript][BotBuilder-Libs] Migrate from TSLint to ESLint (#1696)

* Add ESLint to botbuilder-solutions

* Add ESLint to botbuilder-skills

* Update dependencies

* Fix ESLint issues in botbuilder-solutions

* Fix ESLint issues in botbuilder-skills

* upgrade skills to latest lib version (#1698)

* [Calendar] Add config for slot filling attribute skip (#1647)

* add slot filling default value config

* fix test cases

* add default value config of start date and duration

* add default content and location in common string

* update doc

* Update productivity-calendar.md

* Update productivity-email.md

* Update knownissues.md

* removing template projects from sln as msbuild on devops can't skip certain projects. (#1703)

* VA Deployment Updates (#1694)

* write full validation result to log

* handle spaces in path

* fixed publish with different bot name

* added luis region to all commands

* removed extra registration from skill (#1702)

* Fix broken link to botskills cli (#1708)

* move backgroundImage into column (#1711) (#1712)

They are used in ResponseManager.GetCardResponse as containerItems, so
backgroundImage should be kept in Column.

* [TypeScript][Botskills] Refactor in Mocks folder (#1706)

* Fix typos for errors

* Refactor mocks folder

* Remove unused dependencies in generator-botbuilder-assistant (#1707)

* Update README.md

* Update CODEOWNERS (#1709)

* removed timestamp from Activity events

* added Timezone feature. Fixes #1678

* removed unnecessary Directline constant

* updates:

1. new API sendTimeZoneEvent
2. Settings UI update
3. fixes bug in Synthesizer
4. bot will listen again when expectingInput is received

* Settings screen cleanup

* fix merge for these files with special chars

* Improved broadcasting to 3rd-party apps

* Latest Android Assistant updates (#1771) (#14)

* blue background for users' requests in chat

* added demo feature to update widgets of 3rd party app

* added ISO 8601 timestamps to generated activity events

* pull from upstream (#11)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [SkillsLib]remove http transport and related (#1676)

* remove http transport and related

* try to get RestoreAddtionalProjectSources working

* trigger build

* add package source for Skills test project

* Android app update: Ability to change view between Full Conversation and Conversation (#1681)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* added feature to show full conversation

* latest upstream changes (#8)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [Botskills] Improve error messages (#1683)

* Improve error messages for more verbosity

* Continue improving error messages

* Finish improving error messages

* Improve error handling for authenticationUtils

* Revert changes to arguments arrays

* Add link to documentation when auth fails

* Allow ITriggers with nullable properties (#1685)

* [Botskills] Move location to tools folder (#1666)

* Move botskills cli tool to the tools root folder

* Update doc references

* Update yaml files

* Update package-lock file

* Update build.botskills.ts.ps1

* Update speechenablement.md

* [Botskills] Add re-publish warning (#1686)

* Add warning to republish VA after refresh

* Fix tests

* add flag to include nuget pkgs so nuspec can pick up packages needed (#1690)

* add flag to include nuget pkgs so nuspec can pick up packages needed

* force trigger build

* remove redundant space

* [VA] Updated deployment scripts to assign luis subscription key automatically (#1693)

* add luis sub key

* add azure account

* deploy updates

* deploy fix

* [Botskills] Update documentation (#1688)

* Update botskills documentation

* Remove style of botskills word

* Fix link reference

* Fix references to botskills documentation

* Fix typos

* Apply suggestions from code review

Co-Authored-By: David Favretto <david.favretto@southworks.com>

* Apply suggestions from code review

* upgrade versions of skills and solutions for templates (#1695)

* [TypeScript][BotBuilder-Libs] Migrate from TSLint to ESLint (#1696)

* Add ESLint to botbuilder-solutions

* Add ESLint to botbuilder-skills

* Update dependencies

* Fix ESLint issues in botbuilder-solutions

* Fix ESLint issues in botbuilder-skills

* upgrade skills to latest lib version (#1698)

* [Calendar] Add config for slot filling attribute skip (#1647)

* add slot filling default value config

* fix test cases

* add default value config of start date and duration

* add default content and location in common string

* update doc

* Update productivity-calendar.md

* Update productivity-email.md

* Update knownissues.md

* removing template projects from sln as msbuild on devops can't skip certain projects. (#1703)

* VA Deployment Updates (#1694)

* write full validation result to log

* handle spaces in path

* fixed publish with different bot name

* added luis region to all commands

* removed extra registration from skill (#1702)

* Fix broken link to botskills cli (#1708)

* move backgroundImage into column (#1711) (#1712)

They are used in ResponseManager.GetCardResponse as containerItems, so
backgroundImage should be kept in Column.

* [TypeScript][Botskills] Refactor in Mocks folder (#1706)

* Fix typos for errors

* Refactor mocks folder

* Remove unused dependencies in generator-botbuilder-assistant (#1707)

* Update README.md

* Update CODEOWNERS (#1709)

* removed timestamp from Activity events

* added Timezone feature. Fixes #1678

* removed unnecessary Directline constant

* updates:

1. new API sendTimeZoneEvent
2. Settings UI update
3. fixes bug in Synthesizer
4. bot will listen again when expectingInput is received

* Settings screen cleanup

* fix merge for these files with special chars

* Improved broadcasting to 3rd-party apps

* updated LocationProvider to function without Play Store installed

* added missing fields to Activity model

* fixed spaces in InputHints model

* pulling latest upstream changes (#15)

* Latest Android Assistant updates (#1771)

* blue background for users' requests in chat

* added demo feature to update widgets of 3rd party app

* added ISO 8601 timestamps to generated activity events

* pull from upstream (#11)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [SkillsLib]remove http transport and related (#1676)

* remove http transport and related

* try to get RestoreAddtionalProjectSources working

* trigger build

* add package source for Skills test project

* Android app update: Ability to change view between Full Conversation and Conversation (#1681)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* added feature to show full conversation

* latest upstream changes (#8)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [Botskills] Improve error messages (#1683)

* Improve error messages for more verbosity

* Continue improving error messages

* Finish improving error messages

* Improve error handling for authenticationUtils

* Revert changes to arguments arrays

* Add link to documentation when auth fails

* Allow ITriggers with nullable properties (#1685)

* [Botskills] Move location to tools folder (#1666)

* Move botskills cli tool to the tools root folder

* Update doc references

* Update yaml files

* Update package-lock file

* Update build.botskills.ts.ps1

* Update speechenablement.md

* [Botskills] Add re-publish warning (#1686)

* Add warning to republish VA after refresh

* Fix tests

* add flag to include nuget pkgs so nuspec can pick up packages needed (#1690)

* add flag to include nuget pkgs so nuspec can pick up packages needed

* force trigger build

* remove redundant space

* [VA] Updated deployment scripts to assign luis subscription key automatically (#1693)

* add luis sub key

* add azure account

* deploy updates

* deploy fix

* [Botskills] Update documentation (#1688)

* Update botskills documentation

* Remove style of botskills word

* Fix link reference

* Fix references to botskills documentation

* Fix typos

* Apply suggestions from code review

Co-Authored-By: David Favretto <david.favretto@southworks.com>

* Apply suggestions from code review

* upgrade versions of skills and solutions for templates (#1695)

* [TypeScript][BotBuilder-Libs] Migrate from TSLint to ESLint (#1696)

* Add ESLint to botbuilder-solutions

* Add ESLint to botbuilder-skills

* Update dependencies

* Fix ESLint issues in botbuilder-solutions

* Fix ESLint issues in botbuilder-skills

* upgrade skills to latest lib version (#1698)

* [Calendar] Add config for slot filling attribute skip (#1647)

* add slot filling default value config

* fix test cases

* add default value config of start date and duration

* add default content and location in common string

* update doc

* Update productivity-calendar.md

* Update productivity-email.md

* Update knownissues.md

* removing template projects from sln as msbuild on devops can't skip certain projects. (#1703)

* VA Deployment Updates (#1694)

* write full validation result to log

* handle spaces in path

* fixed publish with different bot name

* added luis region to all commands

* removed extra registration from skill (#1702)

* Fix broken link to botskills cli (#1708)

* move backgroundImage into column (#1711) (#1712)

They are used in ResponseManager.GetCardResponse as containerItems, so
backgroundImage should be kept in Column.

* [TypeScript][Botskills] Refactor in Mocks folder (#1706)

* Fix typos for errors

* Refactor mocks folder

* Remove unused dependencies in generator-botbuilder-assistant (#1707)

* Update README.md

* Update CODEOWNERS (#1709)

* removed timestamp from Activity events

* added Timezone feature. Fixes #1678

* removed unnecessary Directline constant

* updates:

1. new API sendTimeZoneEvent
2. Settings UI update
3. fixes bug in Synthesizer
4. bot will listen again when expectingInput is received

* Settings screen cleanup

* fix merge for these files with special chars

* Improved broadcasting to 3rd-party apps

* use geographyV2 and submit action in poi (#1662)(#1587) (#1713)

* only use LUIS at the beginning when address and keyword are provided

* use geographyV2 when address is empty

* use Action.Submit for POI. However, it will always submit the content when clicked

* submit as ConfirmPrompt for single choice

* use SelectPointOfInterestPrompt for multiple routes

* add handle actions step (#1635)

* use image with route (#1332) (#1733)

* update POISharedResponses and some card.json (#1791) (#1792)

Bing translated..

* [DO NOT MERGE] Updated ToDo skill deployment scripts (#1743)

* updated deployment scripts

* Revert "updated deployment scripts"

This reverts commit 012b26b.

* updated to do deployment scripts

* updated arm template

* updated sample cognitivemodels.json

* fixed casing of ToDoLuis to camel case

* updated luis gen to camel casing

* updated arm template and appsettings.json

* fixed capitalization in arm template

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* updated to do luisgen file

* Update template.json

* Update template.json

* Update template.json

* fixed tests

* Update CODEOWNERS (#1800)

* Update Email deployment scripts (#1744)

* updated deployment scripts

* fixed capitalization

* moved settings out of properties array

* updated arm template

* fixed tests

* updated luis gen file to latest

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Update Email.lu

* Update Email.lu

* Update speechenablement.md

Close #1810 , #1811

* merged latest upstream changes

* fixes #1755 Clean up test events in sidebar

* updated build gradle after Android Studio Update

* latest upstream changes (#16)

* Latest Android Assistant updates (#1771)

* blue background for users' requests in chat

* added demo feature to update widgets of 3rd party app

* added ISO 8601 timestamps to generated activity events

* pull from upstream (#11)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [SkillsLib]remove http transport and related (#1676)

* remove http transport and related

* try to get RestoreAddtionalProjectSources working

* trigger build

* add package source for Skills test project

* Android app update: Ability to change view between Full Conversation and Conversation (#1681)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* added feature to show full conversation

* latest upstream changes (#8)

* Added initial readme for Android Assistant app (#1667)

* Virtual Assistant Client for Android - initial public commit

* updated .gitignore to ensure the /src/debug folder is not ignored

* implemented feedback from PR 1493

* code cleanup after merge

* fixes possible exception due to race condition

* fix: release created and stopped audio records

* added timeout event so that client app can notify user

* WIP adaptive card click events

* WIP adaptive card clicking

* finished implementation of adaptive card clicking

* Updated Location event so that the data is consumed properly

* additional IPA -> VA changes

* logcat logging of complete JSON data

* using suggested actions for adaptive card click

* undo incorrect commit

* added suggested actions feature

* updates to allow the service to receive connections from other apps

* small code updates + locationProvider threading fix

* finished feature to broadcast data to other apps

* added initial readme for Android app

* Update readme.md

* [Botskills] Add a new Known Issue of the CLI tool (#1665)

* Adapt luisgen commands to trailing backslashs

* Add issue in KnownIssues doc

* Add an example of the issue

* [DevOps] Disable builds in pull-request by default (#1661)

* Update YAML files in TypeScript and Csharp

* Update readme in both versions

* Minor changes in YAML files

* Minor changes in readme files

* Updated default comment with sections for bots/deployment scripts (#1669)

* News skill: adding trending articles, favorite topics, searching by market, searching by website  (#1660)

* Added trending articles, changing search market, search specific sites, choosing favorite topics

* Changes from comments

* fis newsLuis

* update publish scripts to fix skill deployment filenotfound issues with kudu (#1668)

* Create release-drafter.yml

* [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673)

* Add ESLint to sample assistant

* Fix ESLint issues in sample-assistant

* Add ESLint to sample skill

* Fix ESLint issues in sample-skill

* Update dependencies

* Update templates

* Update generator

* [Botskills] Improve error messages (#1683)

* Improve error messages for more verbosity

* Continue improving error messages

* Finish improving error messages

* Improve error handling for authenticationUtils

* Revert changes to arguments arrays

* Add link to documentation when auth fails

* Allow ITriggers with nullable properties (#1685)

* [Botskills] Move location to tools folder (#1666)

* Move botskills cli tool to the tools root folder

* Update doc references

* Update yaml files

* Update package-lock file

* Update build.botskills.ts.ps1

* Update speechenablement.md

* [Botskills] Add re-publish warning (#1686)

* Add warning to republish VA after refresh

* Fix tests

* add flag to include nuget pkgs so nuspec can pick up packages needed (#1690)

* add flag to include nuget pkgs so nuspec can pick up packages needed

* force trigger build

* remove redundant space

* [VA] Updated deployment scripts to assign luis subscription key automatically (#1693)

* add luis sub key

* add azure account

* deploy updates

* deploy fix

* [Botskills] Update documentation (#1688)

* Update botskills documentation

* Remove style of botskills word

* Fix link reference

* Fix references to botskills documentation

* Fix typos

* Apply suggestions from code review

Co-Authored-By: David Favretto <david.favretto@southworks.com>

* Apply suggestions from code review

* upgrade versions of skills and solutions for templates (#1695)

* [TypeScript][BotBuilder-Libs] Migrate from TSLint to ESLint (#1696)

* Add ESLint to botbuilder-solutions

* Add ESLint to botbuilder-skills

* Update dependencies

* Fix ESLint issues in botbuilder-solutions

* Fix ESLint issues in botbuilder-skills

* upgrade skills to latest lib version (#1698)

* [Calendar] Add config for slot filling attribute skip (#1647)

* add slot filling default value config

* fix test cases

* add default value config of start date and duration

* add default content and location in common string

* update doc

* Update productivity-calendar.md

* Update productivity-email.md

* Update knownissues.md

* removing template projects from sln as msbuild on devops can't skip certain projects. (#1703)

* VA Deployment Updates (#1694)

* write full validation result to log

* handle spaces in path

* fixed publish with different bot name

* added luis region to all commands

* removed extra registration from skill (#1702)

* Fix broken link to botskills cli (#1708)

* move backgroundImage into column (#1711) (#1712)

They are used in ResponseManager.GetCardResponse as containerItems, so
backgroundImage should be kept in Column.

* [TypeScript][Botskills] Refactor in Mocks folder (#1706)

* Fix typos for errors

* Refactor mocks folder

* Remove unused dependencies in generator-botbuilder-assistant (#1707)

* Update README.md

* Update CODEOWNERS (#1709)

* removed timestamp from Activity events

* added Timezone feature. Fixes #1678

* removed unnecessary Directline constant

* updates:

1. new API sendTimeZoneEvent
2. Settings UI update
3. fixes bug in Synthesizer
4. bot will listen again when expectingInput is received

* Settings screen cleanup

* fix merge for these files with special chars

* Improved broadcasting to 3rd-party apps

* use geographyV2 and submit action in poi (#1662)(#1587) (#1713)

* only use LUIS at the beginning when address and keyword are provided

* use geographyV2 when address is empty

* use Action.Submit for POI. However, it will always submit the content when clicked

* submit as ConfirmPrompt for single choice

* use SelectPointOfInterestPrompt for multiple routes

* add handle actions step (#1635)

* use image with route (#1332) (#1733)

* update POISharedResponses and some card.json (#1791) (#1792)

Bing translated..

* [DO NOT MERGE] Updated ToDo skill deployment scripts (#1743)

* updated deployment scripts

* Revert "updated deployment scripts"

This reverts commit 012b26b.

* updated to do deployment scripts

* updated arm template

* updated sample cognitivemodels.json

* fixed casing of ToDoLuis to camel case

* updated luis gen to camel casing

* updated arm template and appsettings.json

* fixed capitalization in arm template

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* Rename general.lu to General.lu

* Rename todo.lu to ToDo.lu

* updated to do luisgen file

* Update template.json

* Update template.json

* Update template.json

* fixed tests

* Update CODEOWNERS (#1800)

* Update Email deployment scripts (#1744)

* updated deployment scripts

* fixed capitalization

* moved settings out of properties array

* updated arm template

* fixed tests

* updated luis gen file to latest

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Rename email.lu to Email.lu

* Rename general.lu to General.lu

* Update Email.lu

* Update Email.lu

* Update speechenablement.md

Close #1810 , #1811

* Return checklist to PR template (#1801)

* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md

* Fixed some typos (#1816)

* updated documentation

* fixed merge

* continued fixing merge issues

* additional merge-fixed files

* latest upstream updates (#18)

* Delete _config.yml

Remove unused Github Pages file

* Add skills folder (#1825)

* Add files via upload

* Deployment Cleanup for templates (#1823)

* updated VA deployment scripts

* updated skill template

* Remove hardcoded values in ARM template (#1813)

* Remove hardcoded values in ARM template
- Default value for parameters "appInsightsLocation"
- Use parameter value for QnAMaker service

* Changed back QnaMaker to westus

* Reduce QnA KB items across all templates (#1834)

* reduce qna items across C# and QnA Templates + Samples

* Updated Virtual Assistant template/sample FAQ QnA with new content for information on VA & Skills.
Machine translated to EFIGS+ZH

* [Virtual Assistant] Remove Linked Accounts action in IntroCards (#1840)

* Remove Linked Accounts action in TypeScript

* Remove Linked Accounts action in C#

* Replace the path of the pipeline with the root (#1841)

* [TypeScript][BotBuilder Libs] Migrate latest functionalities (#1842)

* Update botbuilder-libs

* Migrate TypeScript implementation (ref 478d627)

* Fix tests

* Fix ESLint issues

* inject all body items in GetCardResponse (#1710) (#1729)

* Update README.md

* Update deployment message (#1817)

* VA Template - New Deployment Features (#1843)

* updated VA deployment scripts

* updated skill template

* updated deployment scripts:
- lite arm template
- fix luis region mismatch
- add unique suffix to service names
- add quotes around appId
- removed hardcoded appinsights region
- fix for underscores in service name

* add comments for local lite development

* updated to latest luisgen format

* update to fix luis region issue

* updated template deployment scripts

* template updates

* updated project template file

* added typescript files back

* Update automotive.lu

* added typescript files back

* ts fixes

* Update todo.lu

* Update todo.lu

* Update pointofinterest.lu

* Update automotive.lu

* Update calendar.lu

* Update calendar.lu

* Update automotive.lu

* Update todo.lu

* Update pointofinterest.lu

* Update restaurant.lu

* Update restaurant.lu

* updated typescript files

* Update restaurant.lu

* Update restaurant.lu

* ts fix

* ts fix

* added useLuisGen flag to update script (for build pipeline)

* updated documentation (#19)

* updated documentation

* documentation update
  • Loading branch information
abiemann committed Jul 16, 2019
1 parent 29375fb commit 7d576ea
Show file tree
Hide file tree
Showing 18 changed files with 222 additions and 208 deletions.
Binary file added docs/media/android_project_overview.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/android_screenshot_main_ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/android_screenshot_navbar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/android_screenshot_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/media/android_studio_credentials_debug.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@
public class DefaultConfiguration {

// Replace below with your own subscription key
public static final String SPEECH_SERVICE_SUBSCRIPTION_KEY = "YOUR_KEY_HERE";//TODO
public static final String SPEECH_SERVICE_SUBSCRIPTION_KEY = "ccbc14f1bb2a476187a831c1dcc6a3fc";

public static final String DIRECT_LINE_SPEECH_SECRET_KEY = "YOUR_DIRECTLINE_SPEECH_KEY_HERE";//TODO
// Ryan's latest Bot : calendar, email, to-do, and point of interest skills
public static final String DIRECT_LINE_SPEECH_SECRET_KEY = "aeRqQEhGPaM.cwA.TkU.3pFGkwEK7X8m4IxFujVOhURSByvHEuVVi1Na_u8yBHI";//aeRqQEhGPaM.cwA.TkU.3pFGkwEK7X8m4IxFujVOhURSByvHEuVVi1Na_u8yBHI

public static final String SPEECH_SERVICE_SUBSCRIPTION_KEY_REGION = "westus2";//TODO
// Replace below with your own service region (e.g., "westus").
public static final String SPEECH_SERVICE_SUBSCRIPTION_KEY_REGION = "westus2";

public static final String USER_NAME = "User";
public static final String USER_FROM_ID = "YOUR_USER_FROM_ID_HERE";//TODO
public static final String USER_FROM_ID = "625d6da6-1862-452b-b0ba-f2fa1ea5a7c5";

public static final String LOCALE = "en-us";

public static final String GEOLOCATION_LAT = "47.617305";
public static final String GEOLOCATION_LON = "-122.192217";
public static final String LOCALE = "en-us"; //note: attempted to use Locale.getDefault().toString(); however it gives a string the bot doesn't recognize
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
import com.microsoft.bot.builder.solutions.directlinespeech.model.Configuration;
import com.microsoft.bot.builder.solutions.virtualassistant.R;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.BaseActivity;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.settings.SettingsActivity;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.actionslist.ActionsAdapter;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.actionslist.ActionsViewholder;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.chatlist.ChatAdapter;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.chatlist.ViewholderBot;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.chatlist.ItemOffsetDecoration;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.chatlist.ViewholderBot;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.settings.SettingsActivity;
import com.microsoft.bot.builder.solutions.virtualassistant.assistant.VoiceInteractionActivity;

import org.greenrobot.eventbus.EventBus;
Expand Down Expand Up @@ -235,10 +235,18 @@ protected void permissionGranted(String manifestPermission) {

@Override
protected void serviceConnected() {
// this code is triggered when a user launches the app a second+ time and the app has permission
// At this point, speechServiceBinder should not be null.
// this code is triggered after the service is bound.
// Binding is started in onStart(), so expect this callback to trigger after onStart()
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
initializeAndConnect();
}

try {
speechServiceBinder.startLocationUpdates();
} catch (RemoteException e) {
e.printStackTrace();
}
}

@Override
Expand All @@ -254,20 +262,6 @@ public boolean onNavigationItemSelected(MenuItem item) {
case R.id.nav_menu_reset_bot:
speechServiceBinder.resetBot();
break;
case R.id.nav_menu_location:
String json = speechServiceBinder.getConfiguration();
Configuration configuration = gson.fromJson(json, new TypeToken<Configuration>(){}.getType());
speechServiceBinder.sendLocationEvent(configuration.geolat, configuration.geolon);
break;
case R.id.nav_menu_welcome_req:
speechServiceBinder.requestWelcomeCard();
break;
case R.id.nav_menu_emulate_activity_msg:
// {"attachmentLayout": "carousel","attachments": [{"content": {XXXX PASTE ADAPTIVE CARD HERE XXXX},"contentType": "application/vnd.microsoft.card.adaptive"}],"channelData": {"conversationalAiData": {"requestInfo": {"interactionId": "b9ad8f12-e459-4a73-a542-919224e83b0a","requestType": 0,"version": "0.2"}}},"channelId": "directlinespeech","conversation": {"id": "490b89e7-ab99-4ec6-b0c8-4cc612d5e4ce","isGroup": false},"entities": [],"from": {"id": "vakonadj"},"id": "a27c2f8da5a845a3942f6a880562114f","inputHint": "expectingInput","recipient": {"id": "490b89e7-ab99-4ec6-b0c8-4cc612d5e4ce|0000"},"replyToId": "c3174265-3b0a-49a1-bdb1-e55c477b8c36","serviceUrl": "PersistentConnection","speak": "Injected Test Message","text": "Injected Test Message","timestamp": "2019-04-25T18:17:12.3964213+00:00","type": "message"}
final String testJson =
"{\"attachmentLayout\": \"carousel\",\"attachments\": [{\"content\": {\"body\": [{\"items\": [{\"columns\": [{\"items\": [{\"color\": \"accent\",\"id\": \"Name\",\"separation\": \"none\",\"size\": \"large\",\"spacing\": \"none\",\"text\": \"City Center Plaza\",\"type\": \"TextBlock\",\"weight\": \"bolder\"}, {\"id\": \"AvailableDetails\",\"isSubtle\": true,\"separation\": \"none\",\"spacing\": \"none\",\"text\": \"Parking Garage\",\"type\": \"TextBlock\"}, {\"color\": \"dark\",\"id\": \"Address\",\"isSubtle\": true,\"separation\": \"none\",\"spacing\": \"none\",\"text\": \"474 108th Avenue Northeast, Bellevue, West Bellevue\",\"type\": \"TextBlock\",\"wrap\": true}, {\"color\": \"dark\",\"id\": \"Hours\",\"isSubtle\": true,\"separation\": \"none\",\"spacing\": \"none\",\"text\": \"\",\"type\": \"TextBlock\",\"wrap\": true}],\"type\": \"Column\",\"verticalContentAlignment\": \"Center\",\"width\": \"90\"}],\"type\": \"ColumnSet\"}],\"type\": \"Container\"}, {\"items\": [{\"id\": \"Image\",\"type\": \"Image\",\"url\": \"https://atlas.microsoft.com/map/static/png?api-version=1.0&layer=basic&style=main&zoom=15&center=-122.19475,47.61426&width=512&height=512&subscription-key=X0_-LfxI-A-iXxsBGb62ZZJfdfr5mbw9LiG8-cL6quM\"}],\"separator\": true,\"type\": \"Container\"}],\"id\": \"PointOfInterestViewCard\",\"speak\": \"City Center Plaza at 474 108th Avenue Northeast\",\"type\": \"AdaptiveCard\",\"version\": \"1.0\"},\"contentType\": \"application/vnd.microsoft.card.adaptive\"}, {\"content\": {\"body\": [{\"type\": \"TextBlock\",\"size\": \"Medium\",\"weight\": \"Bolder\",\"text\": \"Publish Adaptive Card schema\"},{\"type\": \"ColumnSet\",\"columns\": [{\"type\": \"Column\",\"items\": [{\"type\": \"Image\",\"style\": \"Person\",\"url\": \"https://pbs.twimg.com/profile_images/3647943215/d7f12830b3c17a5a9e4afcc370e3a37e_400x400.jpeg\",\"size\": \"Small\"}],\"width\": \"auto\"},{\"type\": \"Column\",\"items\": [{\"type\": \"TextBlock\",\"weight\": \"Bolder\",\"text\": \"Matt Hidinger\",\"wrap\": true},{\"type\": \"TextBlock\",\"spacing\": \"None\",\"text\": \"Created {{DATE(2017-02-14T06:08:39Z, SHORT)}}\",\"isSubtle\": true,\"wrap\": true}],\"width\": \"stretch\"}]},{\"type\": \"TextBlock\",\"text\": \"Now that we have defined the main rules and features of the format, we need to produce a schema and publish it to GitHub. The schema will be the starting point of our reference documentation.\",\"wrap\": true},{\"type\": \"FactSet\",\"facts\": [{\"title\": \"Board:\",\"value\": \"Adaptive Card\"},{\"title\": \"List:\",\"value\": \"Backlog\"},{\"title\": \"Assigned to:\",\"value\": \"Matt Hidinger\"},{\"title\": \"Due date:\",\"value\": \"Not set\"}]}],\"actions\": [{\"type\": \"Action.ShowCard\",\"title\": \"Set due date\",\"card\": {\"type\": \"AdaptiveCard\",\"body\": [{\"type\": \"Input.Date\",\"id\": \"dueDate\"}],\"actions\": [{\"type\": \"Action.Submit\",\"title\": \"OK\"}]}},{\"type\": \"Action.ShowCard\",\"title\": \"Comment\",\"card\": {\"type\": \"AdaptiveCard\",\"body\": [{\"type\": \"Input.Text\",\"id\": \"comment\",\"placeholder\": \"Enter your comment\",\"isMultiline\": true}],\"actions\": [{\"type\": \"Action.Submit\",\"title\": \"OK\"}]}}],\"id\": \"PointOfInterestViewCard\",\"speak\": \"Plaza Center at 10901 NE 9th St\",\"type\": \"AdaptiveCard\",\"version\": \"1.0\"},\"contentType\": \"application/vnd.microsoft.card.adaptive\"}],\"channelData\": {\"conversationalAiData\": {\"requestInfo\": {\"interactionId\": \"b9ad8f12-e459-4a73-a542-919224e83b0a\",\"requestType\": 0,\"version\": \"0.2\"}}},\"channelId\": \"directlinespeech\",\"conversation\": {\"id\": \"490b89e7-ab99-4ec6-b0c8-4cc612d5e4ce\",\"isGroup\": false},\"entities\": [],\"from\": {\"id\": \"vakonadj\"},\"id\": \"a27c2f8da5a845a3942f6a880562114f\",\"inputHint\": \"expectingInput\",\"recipient\": {\"id\": \"490b89e7-ab99-4ec6-b0c8-4cc612d5e4ce|0000\"},\"replyToId\": \"c3174265-3b0a-49a1-bdb1-e55c477b8c36\",\"serviceUrl\": \"PersistentConnection\",\"speak\": \"What do you think of these?,1 - City Center Plaza at 474 108th Avenue Northeast.,2 - Plaza Center at 10901 NE 9th St.\",\"text\": \"What do you think of these?\",\"timestamp\": \"2019-04-25T18:17:12.3964213+00:00\",\"type\": \"message\"}";
speechServiceBinder.injectReceivedActivity(testJson);
break;
case R.id.nav_menu_show_assistant_settings:
startActivity(new Intent(Settings.ACTION_VOICE_INPUT_SETTINGS));
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.RemoteException;
import android.support.annotation.Nullable;
import android.support.design.widget.TextInputEditText;
Expand All @@ -16,7 +14,6 @@

import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.microsoft.bot.builder.solutions.directlinespeech.ConfigurationManager;
import com.microsoft.bot.builder.solutions.directlinespeech.model.Configuration;
import com.microsoft.bot.builder.solutions.virtualassistant.R;
import com.microsoft.bot.builder.solutions.virtualassistant.activities.BaseActivity;
Expand All @@ -40,8 +37,6 @@ public class SettingsActivity extends BaseActivity {
@BindView(R.id.bot_id) TextInputEditText botId;
@BindView(R.id.user_id) TextInputEditText userId;
@BindView(R.id.locale) TextInputEditText locale;
@BindView(R.id.geolocation_lat) TextInputEditText locationLat;
@BindView(R.id.geolocation_lon) TextInputEditText locationLon;
@BindView(R.id.history_linecount) TextInputEditText historyLinecount;
@BindView(R.id.spinner_timezone) Spinner spinnerTimezone;

Expand Down Expand Up @@ -88,7 +83,7 @@ protected void serviceConnected() {
showConfiguration();
}

@OnEditorAction({R.id.history_linecount, R.id.service_key, R.id.service_region, R.id.bot_id, R.id.user_id, R.id.locale, R.id.geolocation_lat, R.id.geolocation_lon})
@OnEditorAction({R.id.history_linecount, R.id.service_key, R.id.service_region, R.id.bot_id, R.id.user_id, R.id.locale})
boolean onEditorAction(int actionId, KeyEvent key){
boolean handled = false;
if (actionId == EditorInfo.IME_ACTION_SEND || (key != null && key.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
Expand Down Expand Up @@ -140,8 +135,6 @@ private void showConfiguration(){
botId.setText(configuration.botId);
userId.setText(configuration.userId);
locale.setText(configuration.locale);
locationLat.setText(configuration.geolat);
locationLon.setText(configuration.geolon);

int iHistoryLinecount = configuration.historyLinecount==null?1:configuration.historyLinecount;
String historyLineCount = String.valueOf(iHistoryLinecount);
Expand All @@ -160,8 +153,6 @@ private void saveConfiguration(){
configuration.botId = botId.getText().toString();
configuration.userId = userId.getText().toString();
configuration.locale = locale.getText().toString();
configuration.geolat = locationLat.getText().toString();
configuration.geolon = locationLon.getText().toString();

// history linecount
configuration.historyLinecount = Integer.valueOf(historyLinecount.getText().toString());
Expand Down
Loading

0 comments on commit 7d576ea

Please sign in to comment.