run json file + communication activity exception handler

tobyli · Aug 1, 2016 · 776a17b · 776a17b
1 parent 39ac8af
commit 776a17b
Show file tree

Hide file tree

Showing 13 changed files with 194 additions and 87 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/appcompat_v7_23_0_1.xml b/.idea/libraries/appcompat_v7_23_0_1.xml
diff --git a/.idea/libraries/design_23_0_1.xml b/.idea/libraries/design_23_0_1.xml
diff --git a/.idea/libraries/support_annotations_23_0_1.xml b/.idea/libraries/support_annotations_23_0_1.xml
diff --git a/.idea/libraries/support_v4_23_0_1.xml b/.idea/libraries/support_v4_23_0_1.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/edu/cmu/hcii/sugilite/RecordingPopUpDialog.java b/app/src/main/java/edu/cmu/hcii/sugilite/RecordingPopUpDialog.java
@@ -150,6 +150,7 @@ public void turnOffRecording(View view)
         prefEditor.commit();
         if(sugiliteData.initiatedExternally == true && sugiliteData.getScriptHead() != null)
             sugiliteData.communicationController.sendRecordingFinishedSignal(sugiliteData.getScriptHead().getScriptName());
+            sugiliteData.sendCallbackMsg("FINISHED_RECORDING", sugiliteData.getScriptHead().getScriptName(), sugiliteData.callbackString);
         dialog.dismiss();
     }
 

diff --git a/app/src/main/java/edu/cmu/hcii/sugilite/SettingsActivity.java b/app/src/main/java/edu/cmu/hcii/sugilite/SettingsActivity.java
@@ -188,6 +188,7 @@ public void onClick(DialogInterface dialog, int which) {
                     else{
                         if(sugiliteData.initiatedExternally == true && sugiliteData.getScriptHead() != null)
                             sugiliteData.communicationController.sendRecordingFinishedSignal(sugiliteData.getScriptHead().getScriptName());
+                            sugiliteData.sendCallbackMsg("FINISHED_RECORDING", sugiliteData.getScriptHead().getScriptName(), sugiliteData.callbackString);
                     }
                     break;
 

diff --git a/app/src/main/java/edu/cmu/hcii/sugilite/SugiliteData.java b/app/src/main/java/edu/cmu/hcii/sugilite/SugiliteData.java
@@ -1,6 +1,7 @@
 package edu.cmu.hcii.sugilite;
 
 import android.app.Application;
+import android.content.Intent;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -125,5 +126,28 @@ else if (currentBlock instanceof SugiliteOperationBlock){
         return sugiliteBlocks;
     }
 
+    /**
+     * send a new intent to the location specified in callbackString
+     * @param messageType
+     * @param messageBody
+     * @param callbackString
+     */
+
+    /*
+    messageType, messageBody
+    -------------------------
+    "FINISHED_RECORDING", scriptName
+
+
+     */
+    public String callbackString = "";
+    public void sendCallbackMsg(String messageType, String messageBody, String callbackString){
+        Intent intent = new Intent(callbackString);
+        intent.putExtra("messageType", messageType);
+        intent.putExtra("messageBody", messageBody);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+        startActivity(intent);
+    }
+
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,6 +188,7 @@ public void onClick(DialogInterface dialog, int which) { @@
                         else{
                             if(sugiliteData.initiatedExternally == true && sugiliteData.getScriptHead() != null)
                                 sugiliteData.communicationController.sendRecordingFinishedSignal(sugiliteData.getScriptHead().getScriptName());
+                                sugiliteData.sendCallbackMsg("FINISHED_RECORDING", sugiliteData.getScriptHead().getScriptName(), sugiliteData.callbackString);
                         }
                         break;
@@ Expand Down @@