Integration Firebase Functions

dialogflow/app/src/main/java/com/google/cloud/examples/dialogflow/AppController.java

@@ -15,22 +15,21 @@ public class AppController extends Application {
     public static final String SESSION_ID = "sessionId";
     public static String PROJECT_ID = "";
 
-    public static void playAudio(byte[] mp3SoundByteArray) {
+    public static void playAudio(byte[] byteArray) {
         MediaPlayer mediaPlayer = new MediaPlayer();
         try {
-            File tempMp3 = File.createTempFile("dialogFlow", "mp3", Environment.getExternalStorageDirectory());
-            tempMp3.deleteOnExit();
-            FileOutputStream fos = new FileOutputStream(tempMp3);
-            fos.write(mp3SoundByteArray);
+            File tempFile = File.createTempFile("dialogFlow", null, Environment.getExternalStorageDirectory());
+            tempFile.deleteOnExit();
+            FileOutputStream fos = new FileOutputStream(tempFile);
+            fos.write(byteArray);
             fos.close();
             mediaPlayer.reset();
-            FileInputStream fis = new FileInputStream(tempMp3);
+            FileInputStream fis = new FileInputStream(tempFile);
             mediaPlayer.setDataSource(fis.getFD());
 
             mediaPlayer.prepare();
             mediaPlayer.start();
         } catch (IOException ex) {
-            String s = ex.toString();
             ex.printStackTrace();
         }
     }

dialogflow/app/src/main/java/com/google/cloud/examples/dialogflow/ui/ChatActivity.java

@@ -10,9 +10,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.speech.RecognizerIntent;
-import android.speech.tts.TextToSpeech;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
@@ -35,11 +33,9 @@
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Locale;
 
 public class ChatActivity extends AppCompatActivity {
 
-    private static TextToSpeech textToSpeech;
     private static ChatRecyclerViewAdapter chatRecyclerViewAdapter;
     private static ArrayList<ChatMsgModel> chatMsgModels;
     private static RecyclerView rvChats;
@@ -133,33 +129,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         apiRequest = new ApiRequest();
 
-        initTextToSpeech();
-
-    }
-
-    /**
-     * function to initialize the Text To Speech for voice output
-     */
-    private void initTextToSpeech() {
-        textToSpeech = new TextToSpeech(getApplicationContext(), new TextToSpeech.OnInitListener() {
-            @Override
-            public void onInit(int status) {
-                if (status == TextToSpeech.SUCCESS) {
-                    int ttsLang = textToSpeech.setLanguage(Locale.US);
-
-                    if (ttsLang == TextToSpeech.LANG_MISSING_DATA
-                            || ttsLang == TextToSpeech.LANG_NOT_SUPPORTED) {
-                        Log.e("TTS", "The Language is not supported!");
-                    } else {
-                        Log.i("TTS", "Language Supported.");
-                    }
-                    Log.i("TTS", "Initialization success.");
-                } else {
-                    Toast.makeText(getApplicationContext(), "TTS Initialization failed!", Toast.LENGTH_SHORT).show();
-                }
-            }
-        });
-
     }
 
     /**
@@ -318,15 +287,6 @@ protected void onPause() {
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (textToSpeech != null) {
-            textToSpeech.stop();
-            textToSpeech.shutdown();
-        }
-    }
-
     public void showMorePopup() {
         PopupMenu popup = new PopupMenu(this, ibMore);
         popup.inflate(R.menu.main_menu);
@@ -380,7 +340,6 @@ public APIRequest(String token, Date expiryTime, String msg, boolean tts, boolea
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            showProgressDialog();
         }
 
         @Override
@@ -391,7 +350,6 @@ protected String doInBackground(Void... voids) {
         @Override
         protected void onPostExecute(String response) {
             super.onPostExecute(response);
-            alert.dismiss();
             addMsg(response, 0);
         }
     }

dialogflow/app/src/main/java/com/google/cloud/examples/dialogflow/utils/ApiRequest.java

@@ -1,8 +1,5 @@
 package com.google.cloud.examples.dialogflow.utils;
 
-import android.content.Context;
-import android.widget.Toast;
-
 import com.google.api.gax.core.FixedCredentialsProvider;
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.AccessToken;
@@ -49,7 +46,7 @@ public ApiRequest() {
      * @param tts         :   send message to text to speech if true
      * @param sentiment   :   send message to sentiment analysis if true
      * @param knowledge   :   send message to knowledge base if true
-     * @return            :   response from the server
+     * @return :   response from the server
      */
     public String callAPI(String accessToken, Date expiryTime, String msg, boolean tts, boolean sentiment, boolean knowledge) {
         this.token = accessToken;
@@ -64,7 +61,7 @@ public String callAPI(String accessToken, Date expiryTime, String msg, boolean t
      * @param tts       :   send message to text to speech if true
      * @param sentiment :   send message to sentiment analysis if true
      * @param knowledge :   send message to knowledge base if true
-     * @return          :   response from the server
+     * @return :   response from the server
      */
     private String detectIntent(String msg, boolean tts, boolean sentiment, boolean knowledge) {
         try {
@@ -91,7 +88,7 @@ private String detectIntent(String msg, boolean tts, boolean sentiment, boolean
 
             sessionsClient.close();
 
-            if(tts) {
+            if (tts) {
                 AppController.playAudio(detectIntentResponse.getOutputAudio().toByteArray());
             }
 
@@ -104,8 +101,9 @@ private String detectIntent(String msg, boolean tts, boolean sentiment, boolean
 
     /**
      * function to handle the results
-     * @param detectIntentResponse  :   detectIntentResponse object
-     * @return  :   String response
+     *
+     * @param detectIntentResponse :   detectIntentResponse object
+     * @return :   String response
      */
     private String handleResults(DetectIntentResponse detectIntentResponse) {
         QueryResult queryResult = detectIntentResponse.getQueryResult();
@@ -143,54 +141,52 @@ private String handleResults(DetectIntentResponse detectIntentResponse) {
      * @return : DetectIntentRequest object
      */
     private DetectIntentRequest getDetectIntentRequest(SessionName sessionName, QueryInput queryInput, boolean tts, boolean sentiment, boolean knowledge, FixedCredentialsProvider fixedCredentialsProvider) throws Exception {
-        DetectIntentRequest detectIntentRequest = DetectIntentRequest.newBuilder()
+        DetectIntentRequest.Builder detectIntentRequestBuilder = DetectIntentRequest.newBuilder()
                 .setSession(sessionName.toString())
-                .setQueryInput(queryInput)
-                .build();
-        QueryParameters queryParameters = QueryParameters.newBuilder().build();
+                .setQueryInput(queryInput);
 
+        QueryParameters.Builder queryParametersBuilder = QueryParameters.newBuilder();
 
         if (tts) {
-            OutputAudioEncoding audioEncoding = OutputAudioEncoding.OUTPUT_AUDIO_ENCODING_LINEAR_16;
+            OutputAudioEncoding audioEncoding = OutputAudioEncoding.OUTPUT_AUDIO_ENCODING_MP3;
             int sampleRateHertz = 16000;
             OutputAudioConfig outputAudioConfig = OutputAudioConfig.newBuilder()
                     .setAudioEncoding(audioEncoding)
                     .setSampleRateHertz(sampleRateHertz)
                     .build();
 
-            detectIntentRequest.toBuilder()
-                    .setOutputAudioConfig(outputAudioConfig)
-                    .build();
+            detectIntentRequestBuilder.setOutputAudioConfig(outputAudioConfig);
         }
 
         if (sentiment) {
-            SentimentAnalysisRequestConfig sentimentAnalysisRequestConfig = SentimentAnalysisRequestConfig.newBuilder().setAnalyzeQueryTextSentiment(true).build();
+            SentimentAnalysisRequestConfig sentimentAnalysisRequestConfig =
+                    SentimentAnalysisRequestConfig.newBuilder()
+                            .setAnalyzeQueryTextSentiment(true).build();
 
-            queryParameters.toBuilder()
-                    .setSentimentAnalysisRequestConfig(sentimentAnalysisRequestConfig)
-                    .build();
-            detectIntentRequest.toBuilder()
-                    .setQueryParams(queryParameters)
-                    .build();
+            queryParametersBuilder
+                    .setSentimentAnalysisRequestConfig(sentimentAnalysisRequestConfig);
         }
 
 
         if (knowledge) {
-            KnowledgeBasesSettings knowledgeSessionsSettings = KnowledgeBasesSettings.newBuilder().setCredentialsProvider(fixedCredentialsProvider).build();
-            ArrayList<String> knowledgeBaseNames = KnowledgeBaseUtils.listKnowledgeBases(AppController.PROJECT_ID, knowledgeSessionsSettings);
+            KnowledgeBasesSettings knowledgeSessionsSettings = KnowledgeBasesSettings.newBuilder()
+                    .setCredentialsProvider(fixedCredentialsProvider).build();
+            ArrayList<String> knowledgeBaseNames =
+                    KnowledgeBaseUtils.listKnowledgeBases(
+                            AppController.PROJECT_ID, knowledgeSessionsSettings);
+
             if (knowledgeBaseNames.size() > 0) {
                 // As an example, we'll only grab the first Knowledge Base
-                queryParameters.toBuilder()
-                        .addKnowledgeBaseNames(knowledgeBaseNames.get(0))
-                        .build();
-                detectIntentRequest.toBuilder()
-                        .setQueryParams(queryParameters)
-                        .build();
+                queryParametersBuilder.addKnowledgeBaseNames(knowledgeBaseNames.get(0));
             }
         }
 
-        return detectIntentRequest;
+        QueryParameters queryParameters = queryParametersBuilder.build();
+        detectIntentRequestBuilder.setQueryParams(queryParameters);
+
+        return detectIntentRequestBuilder.build();
     }
+
 }