This repository was archived by the owner on Apr 6, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 589
Integration Firebase Functions #108
Closed
deekshithreddyr
wants to merge
27
commits into
GoogleCloudPlatform:master
from
deekshithreddyr:master
Closed
Changes from 19 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
aa516b2
Initial commit
deekshithreddyr ad096da
Addressed review comments
deekshithreddyr 2a0b27f
Added README File
deekshithreddyr bbd9f4e
Update README.md
deekshithreddyr a4f9ba8
Update README.md
deekshithreddyr b33d644
Update README.md
deekshithreddyr 6ce8859
refactor: refactoring the code
deekshithreddyr 0f862d4
Merge branch 'master' of https://github.com/deekshithreddyr/android-d…
deekshithreddyr 2e38050
Add stopwatchagent.zip file
deekshithreddyr c3c2b78
Update README.md
deekshithreddyr bba436b
Update README.md
deekshithreddyr b168253
Changes has per Github comments
deekshithreddyr e7d5487
Combine the three requests into one. Dropdown instead of multi-selec…
deekshithreddyr 9dcf0d1
Addressed review comments
deekshithreddyr 9ddd430
Using the Audio returned from Dialogflow.
deekshithreddyr 1c2b79f
Addressed review comments
deekshithreddyr 462db73
Separated the Authentication code from AppController.java to AuthUtil…
deekshithreddyr c8371eb
Code Refinement
deekshithreddyr 20b798a
Update README.md
deekshithreddyr d31ecb6
Update README.md
deekshithreddyr cafff50
Addressed review comments
deekshithreddyr 6b8e4bd
Merge branch 'master' of https://github.com/deekshithreddyr/android-d…
deekshithreddyr 4dd38b9
function to convert the time from UTC to local TimeZone added
deekshithreddyr 73edd3f
Code readability update
deekshithreddyr 12e2d39
Update README.md
deekshithreddyr 26599e8
Speech2speech Initial commit
deekshithreddyr 32020e9
Merge branch 'master' of https://github.com/deekshithreddyr/android-d…
deekshithreddyr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| *.iml | ||
| .gradle | ||
| /local.properties | ||
| /.idea/workspace.xml | ||
| /.idea/libraries | ||
| .DS_Store | ||
| /build | ||
| /captures | ||
| .externalNativeBuild |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| # Dialogflow Sample | ||
|
|
||
| This app demonstrates how to make gRPC connections to the [Dialogflow API](https://cloud.google.com/dialogflow-enterprise/) | ||
|
|
||
| The app demonstrates how to detect intents: | ||
| - Via Text | ||
| - Via Streaming Audio | ||
| - With Sentiment Analysis | ||
| - With Text-to-Speech | ||
| - With Knowledge Connectors | ||
|
|
||
| To call the Dialogflow API from Android, you need to get authorization tokens from Firebase Cloud Messaging for them to be accepted by the Dialogflow API. To get this token, this sample uses a Firebase Function (in Node.js) to generate these tokens on the behalf of a service account to be used by the app when making a request to the Dialogflow API. | ||
|
|
||
| ## Prerequisites | ||
| - An Android device or emulator | ||
| - Android Studio 3 or later | ||
|
|
||
| ## Setup | ||
| - Create a project (or use an existing one) in the [Google Cloud Console][cloud-console] | ||
| - Enable the [Dialogflow API](https://console.cloud.google.com/apis/library/dialogflow.googleapis.com). | ||
| - Enable the [IAM Service Account Credentials API](https://pantheon.corp.google.com/apis/library/iamcredentials.googleapis.com). | ||
| - [Enable billing][billing]. | ||
| - Be sure that you have gone through the steps by expanding the [Create an agent](https://cloud.google.com/dialogflow-enterprise/docs/quickstart-console#create-an-agent) to create and configure your stopwatch agent. | ||
| - [Import the Dialogflow Agent](https://dialogflow.com/docs/agents/export-import-restore#import) using the `StopwatchAgent.zip` which is located in the `stopwatch` directory. | ||
| - [Create a Service account](https://cloud.google.com/iam/docs/creating-managing-service-accounts) with the following IAM role: `Dialogflow API Client`. Example name: `dialogflow-client`. ([For more info on: how to add roles to a Service Account](https://cloud.google.com/iam/docs/granting-roles-to-service-accounts#granting_access_to_a_service_account_for_a_resource)) | ||
| - Under Dialogflow-client, Click on edit permission icon on the right and add another role as follows and save the changes: | ||
| - Dialogflow Client | ||
| - Dialogflow Reader | ||
| - Enable beta features for: | ||
| - [Sentiment Analysis](https://cloud.google.com/dialogflow-enterprise/docs/sentiment#enable_beta_features) | ||
| - [Text-to-Speech](https://cloud.google.com/dialogflow-enterprise/docs/detect-intent-tts#enable_beta_features) | ||
| - [Knowledge Connectors](https://cloud.google.com/dialogflow-enterprise/docs/knowledge-connectors#enable_beta_features) | ||
|
|
||
| ### Setup the app | ||
| -Clone this repository `git clone https://github.com/GoogleCloudPlatform/android-docs-samples.git` | ||
| - Replace GCP_PROJECT_ID in strings.xml with your Project ID | ||
|
|
||
| ### Setup Firebase on the application: | ||
| - Complete the steps for [Add Firebase to your app](https://firebase.google.com/docs/android/setup) and expand the "Create a Firebase project" section for instructions on how to add project to your Firebase console. Note: No need to complete any other sections, they are already done. | ||
| - In the [Firebase console](https://console.firebase.google.com/), open the "Authentication" section under Develop. | ||
| - On the **Sign-in Methods** page, enable the **Anonymous** sign-in method. | ||
| - Give the package name of the app as `com.google.cloud.examples.dialogflow` | ||
|
|
||
| ### Setup and Deploy the Firebase Function | ||
| The Firebase Function provides auth tokens to your app, You'll be using a provided sample function to be run with this app. | ||
|
|
||
| - Follow the steps in this [guide](https://firebase.google.com/docs/functions/get-started) for: | ||
| - "1. Set up Node.js and the Firebase CLI" | ||
| - "2. Initialize Firebase SDK for Cloud Functions". | ||
| - Replace `index.js` file with the [provided index.js](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/functions/dialogflow/functions/index.js). | ||
| - Open `index.js`, go to function "generateAccessToken", and replace “SERVICE-ACCOUNT-NAME@YOUR_PROJECT_ID.iam.gserviceaccount.com” with your Service account name (`dialogflow-client`) and project id. | ||
| - Deploy getOAuthToken method by running command: | ||
| ``` | ||
| firebase deploy --only functions | ||
| ``` | ||
| - For your "App Engine Default Service Account" add the following IAM role: `Service Account Token Creator` . ([For more info on: how to add roles to a Service Account](https://cloud.google.com/iam/docs/granting-roles-to-service-accounts#granting_access_to_a_service_account_for_a_resource)) | ||
|
|
||
| - For more info please refer (https://firebase.google.com/docs/functions/get-started). | ||
|
|
||
| ## Run the app | ||
| - You are now ready to build and run the project. In Android Studio you can do this by clicking the 'Play' button in the toolbar. This will launch the app on the emulator or on the device you've selected. | ||
| - As soon the app launches, it will ask for the google sign-in. | ||
| - After successful signing in, choose the option by selecting a checkbox and click on chat button | ||
| - Type the message to send and click on the send button on the bottom right. | ||
| - Alternatively tap on the mic button to speak and send the message to the Dialogflow. | ||
|
|
||
|
|
||
| [cloud-console]: https://console.cloud.google.com | ||
| [git]: https://git-scm.com/ | ||
| [android-studio]: https://developer.android.com/studio | ||
| [billing]: https://console.cloud.google.com/billing?project=_ | ||
| [Firebase]: https://firebase.google.com/ | ||
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /build |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| compileSdkVersion 28 | ||
| defaultConfig { | ||
| applicationId "com.google.cloud.examples.dialogflow" | ||
| minSdkVersion 26 | ||
| targetSdkVersion 28 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
| multiDexEnabled true | ||
| } | ||
| buildTypes { | ||
| release { | ||
| minifyEnabled true | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| packagingOptions { | ||
| exclude 'META-INF/DEPENDENCIES' | ||
| exclude 'META-INF/LICENSE' | ||
| exclude 'META-INF/LICENSE.txt' | ||
| exclude 'META-INF/license.txt' | ||
| exclude 'META-INF/NOTICE' | ||
| exclude 'META-INF/NOTICE.txt' | ||
| exclude 'META-INF/notice.txt' | ||
| exclude 'META-INF/ASL2.0' | ||
| exclude 'META-INF/INDEX.LIST' | ||
| exclude 'META-INF/io.netty.versions.properties' | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
||
| implementation 'com.android.support:appcompat-v7:28.0.0' | ||
| implementation 'com.android.support.constraint:constraint-layout:1.1.3' | ||
| implementation 'com.android.support:design:28.0.0' | ||
| configurations.all { | ||
| resolutionStrategy.force 'com.android.support:support-annotations:25.3.0' | ||
| } | ||
| implementation fileTree(dir: 'libs', include: ['*.jar']) | ||
| implementation 'androidx.appcompat:appcompat:1.0.2' | ||
| implementation 'com.google.android.material:material:1.0.0' | ||
| implementation 'androidx.constraintlayout:constraintlayout:1.1.3' | ||
| testImplementation 'junit:junit:4.12' | ||
| androidTestImplementation 'androidx.test:runner:1.2.0' | ||
| androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' | ||
|
|
||
| implementation 'com.google.firebase:firebase-core:17.0.1' | ||
| implementation 'com.google.firebase:firebase-auth:18.1.0' | ||
| implementation 'com.firebaseui:firebase-ui-auth:4.1.0' | ||
| implementation 'com.google.firebase:firebase-messaging:19.0.1' | ||
| implementation 'com.google.firebase:firebase-functions:18.1.0' | ||
| implementation 'com.android.volley:volley:1.1.1' | ||
| implementation 'com.google.cloud:google-cloud-dialogflow:0.98.0-alpha' | ||
| implementation group: 'io.grpc', name: 'grpc-okhttp', version: '1.21.0' | ||
| implementation group: 'io.grpc', name: 'grpc-netty', version: '1.21.0' | ||
|
|
||
| } | ||
|
|
||
|
|
||
| apply plugin: 'com.google.gms.google-services' |
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #Mon Jul 22 11:29:16 PDT 2019 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| #!/usr/bin/env sh | ||
|
|
||
| ############################################################################## | ||
| ## | ||
| ## Gradle start up script for UN*X | ||
| ## | ||
| ############################################################################## | ||
|
|
||
| # Attempt to set APP_HOME | ||
| # Resolve links: $0 may be a link | ||
| PRG="$0" | ||
| # Need this for relative symlinks. | ||
| while [ -h "$PRG" ] ; do | ||
| ls=`ls -ld "$PRG"` | ||
| link=`expr "$ls" : '.*-> \(.*\)$'` | ||
| if expr "$link" : '/.*' > /dev/null; then | ||
| PRG="$link" | ||
| else | ||
| PRG=`dirname "$PRG"`"/$link" | ||
| fi | ||
| done | ||
| SAVED="`pwd`" | ||
| cd "`dirname \"$PRG\"`/" >/dev/null | ||
| APP_HOME="`pwd -P`" | ||
| cd "$SAVED" >/dev/null | ||
|
|
||
| APP_NAME="Gradle" | ||
| APP_BASE_NAME=`basename "$0"` | ||
|
|
||
| # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | ||
| DEFAULT_JVM_OPTS="" | ||
|
|
||
| # Use the maximum available, or set MAX_FD != -1 to use that value. | ||
| MAX_FD="maximum" | ||
|
|
||
| warn () { | ||
| echo "$*" | ||
| } | ||
|
|
||
| die () { | ||
| echo | ||
| echo "$*" | ||
| echo | ||
| exit 1 | ||
| } | ||
|
|
||
| # OS specific support (must be 'true' or 'false'). | ||
| cygwin=false | ||
| msys=false | ||
| darwin=false | ||
| nonstop=false | ||
| case "`uname`" in | ||
| CYGWIN* ) | ||
| cygwin=true | ||
| ;; | ||
| Darwin* ) | ||
| darwin=true | ||
| ;; | ||
| MINGW* ) | ||
| msys=true | ||
| ;; | ||
| NONSTOP* ) | ||
| nonstop=true | ||
| ;; | ||
| esac | ||
|
|
||
| CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | ||
|
|
||
| # Determine the Java command to use to start the JVM. | ||
| if [ -n "$JAVA_HOME" ] ; then | ||
| if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | ||
| # IBM's JDK on AIX uses strange locations for the executables | ||
| JAVACMD="$JAVA_HOME/jre/sh/java" | ||
| else | ||
| JAVACMD="$JAVA_HOME/bin/java" | ||
| fi | ||
| if [ ! -x "$JAVACMD" ] ; then | ||
| die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME | ||
| Please set the JAVA_HOME variable in your environment to match the | ||
| location of your Java installation." | ||
| fi | ||
| else | ||
| JAVACMD="java" | ||
| which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | ||
| Please set the JAVA_HOME variable in your environment to match the | ||
| location of your Java installation." | ||
| fi | ||
|
|
||
| # Increase the maximum file descriptors if we can. | ||
| if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then | ||
| MAX_FD_LIMIT=`ulimit -H -n` | ||
| if [ $? -eq 0 ] ; then | ||
| if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then | ||
| MAX_FD="$MAX_FD_LIMIT" | ||
| fi | ||
| ulimit -n $MAX_FD | ||
| if [ $? -ne 0 ] ; then | ||
| warn "Could not set maximum file descriptor limit: $MAX_FD" | ||
| fi | ||
| else | ||
| warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" | ||
| fi | ||
| fi | ||
|
|
||
| # For Darwin, add options to specify how the application appears in the dock | ||
| if $darwin; then | ||
| GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" | ||
| fi | ||
|
|
||
| # For Cygwin, switch paths to Windows format before running java | ||
| if $cygwin ; then | ||
| APP_HOME=`cygpath --path --mixed "$APP_HOME"` | ||
| CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` | ||
| JAVACMD=`cygpath --unix "$JAVACMD"` | ||
|
|
||
| # We build the pattern for arguments to be converted via cygpath | ||
| ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` | ||
| SEP="" | ||
| for dir in $ROOTDIRSRAW ; do | ||
| ROOTDIRS="$ROOTDIRS$SEP$dir" | ||
| SEP="|" | ||
| done | ||
| OURCYGPATTERN="(^($ROOTDIRS))" | ||
| # Add a user-defined pattern to the cygpath arguments | ||
| if [ "$GRADLE_CYGPATTERN" != "" ] ; then | ||
| OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" | ||
| fi | ||
| # Now convert the arguments - kludge to limit ourselves to /bin/sh | ||
| i=0 | ||
| for arg in "$@" ; do | ||
| CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` | ||
| CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option | ||
|
|
||
| if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition | ||
| eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` | ||
| else | ||
| eval `echo args$i`="\"$arg\"" | ||
| fi | ||
| i=$((i+1)) | ||
| done | ||
| case $i in | ||
| (0) set -- ;; | ||
| (1) set -- "$args0" ;; | ||
| (2) set -- "$args0" "$args1" ;; | ||
| (3) set -- "$args0" "$args1" "$args2" ;; | ||
| (4) set -- "$args0" "$args1" "$args2" "$args3" ;; | ||
| (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; | ||
| (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; | ||
| (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; | ||
| (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; | ||
| (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; | ||
| esac | ||
| fi | ||
|
|
||
| # Escape application args | ||
| save () { | ||
| for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done | ||
| echo " " | ||
| } | ||
| APP_ARGS=$(save "$@") | ||
|
|
||
| # Collect all arguments for the java command, following the shell quoting and substitution rules | ||
| eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" | ||
|
|
||
| # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong | ||
| if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then | ||
| cd "$(dirname "$0")" | ||
| fi | ||
|
|
||
| exec "$JAVACMD" "$@" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ooo let's add a small note that sorta explains why we chose each Role.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated