Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#42] Replacing "Recovering session" per "Recover session" #45

Merged
merged 3 commits into from
Jun 13, 2014
Merged

[#42] Replacing "Recovering session" per "Recover session" #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e740e4
[#42] Replacing 'Recovering session' per 'Recover session'
chrqls Jun 9, 2014
81ac633
Merge commit '6c3923a' into dev
chrqls Jun 9, 2014
b513030
Replacing default value IP when saving an IQSet ('No IP address' inst…
chrqls Jun 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<string name="no_picture">No picture</string>

<string name="start_making">Start Making Questions</string>
<string name="recovering_session">Recovering Session</string>
<string name="recover_session">Recover Session</string>
<string name="use_prepared">Use Prepared Questions</string>
<string name="start_solving">Start Solving \n Questions</string>
<string name="show_results">Finish:\nShow Results</string>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/smilec/smile/bu/json/IQSetJSONParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static final JSONObject wrapQuestionsIntoIQSet(String nameOfIQSet, Collec

iqdata.put(new JSONObject()
.put(Constants.NAME, question.getOwner())
.put(Constants.IP,"127.0.0.1")
.put(Constants.IP,"No IP address")
.put(Constants.QUESTION, question.getQuestion())
.put(Constants.OPTION_1, question.getOption1())
.put(Constants.OPTION_2, question.getOption2())
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/smilec/smile/ui/ChooseActivityFlowDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ protected void onResume() {
btUse.setEnabled(false);
btUse.setBackgroundResource(R.drawable.button_grey);
btStart.setBackgroundResource(R.drawable.button_orange);
btStart.setText(R.string.recovering_session);
btStart.setText(R.string.recover_session);
} else {
btUse.setEnabled(true);
btUse.setBackgroundResource(R.drawable.button_blue);
Expand Down