Skip to content

Commit 776a17b

Browse files
committed
run json file + communication activity exception handler
1 parent 39ac8af commit 776a17b

File tree

13 files changed

+194
-87
lines changed

13 files changed

+194
-87
lines changed

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/appcompat_v7_23_0_1.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/design_23_0_1.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/support_annotations_23_0_1.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/support_v4_23_0_1.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/edu/cmu/hcii/sugilite/RecordingPopUpDialog.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ public void turnOffRecording(View view)
150150
prefEditor.commit();
151151
if(sugiliteData.initiatedExternally == true && sugiliteData.getScriptHead() != null)
152152
sugiliteData.communicationController.sendRecordingFinishedSignal(sugiliteData.getScriptHead().getScriptName());
153+
sugiliteData.sendCallbackMsg("FINISHED_RECORDING", sugiliteData.getScriptHead().getScriptName(), sugiliteData.callbackString);
153154
dialog.dismiss();
154155
}
155156

app/src/main/java/edu/cmu/hcii/sugilite/SettingsActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ public void onClick(DialogInterface dialog, int which) {
188188
else{
189189
if(sugiliteData.initiatedExternally == true && sugiliteData.getScriptHead() != null)
190190
sugiliteData.communicationController.sendRecordingFinishedSignal(sugiliteData.getScriptHead().getScriptName());
191+
sugiliteData.sendCallbackMsg("FINISHED_RECORDING", sugiliteData.getScriptHead().getScriptName(), sugiliteData.callbackString);
191192
}
192193
break;
193194

app/src/main/java/edu/cmu/hcii/sugilite/SugiliteData.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package edu.cmu.hcii.sugilite;
22

33
import android.app.Application;
4+
import android.content.Intent;
45

56
import java.util.ArrayDeque;
67
import java.util.ArrayList;
@@ -125,5 +126,28 @@ else if (currentBlock instanceof SugiliteOperationBlock){
125126
return sugiliteBlocks;
126127
}
127128

129+
/**
130+
* send a new intent to the location specified in callbackString
131+
* @param messageType
132+
* @param messageBody
133+
* @param callbackString
134+
*/
135+
136+
/*
137+
messageType, messageBody
138+
-------------------------
139+
"FINISHED_RECORDING", scriptName
140+
141+
142+
*/
143+
public String callbackString = "";
144+
public void sendCallbackMsg(String messageType, String messageBody, String callbackString){
145+
Intent intent = new Intent(callbackString);
146+
intent.putExtra("messageType", messageType);
147+
intent.putExtra("messageBody", messageBody);
148+
intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
149+
startActivity(intent);
150+
}
151+
128152

129153
}

0 commit comments

Comments
 (0)