Kaydet (Commit) b1cd18bc authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt

Return empty string for null notes to avoid showing null in UI.

Change-Id: I1f60ce48d9d11b074aa268eda118c427b3cc62c0
üst 1ec2482f
...@@ -56,6 +56,11 @@ public class NetworkClient extends Client { ...@@ -56,6 +56,11 @@ public class NetworkClient extends Client {
// Wait until we get the appropriate string back... // Wait until we get the appropriate string back...
String aTemp = mReader.readLine(); String aTemp = mReader.readLine();
if (aTemp == null) {
throw new IOException(
"End of stream reached before any data received.");
}
while (!aTemp.equals("LO_SERVER_SERVER_PAIRED")) { while (!aTemp.equals("LO_SERVER_SERVER_PAIRED")) {
if (aTemp.equals("LO_SERVER_VALIDATING_PIN")) { if (aTemp.equals("LO_SERVER_VALIDATING_PIN")) {
// Broadcast that we need a pin screen. // Broadcast that we need a pin screen.
......
...@@ -62,7 +62,12 @@ public class SlideShow { ...@@ -62,7 +62,12 @@ public class SlideShow {
} }
public String getNotes(int aSlide) { public String getNotes(int aSlide) {
return mNotes.get(aSlide); String aNote = mNotes.get(aSlide);
if (aNote != null) {
return aNote;
} else {
return "";
}
} }
// ---------------------------------------------------- TIMER -------------- // ---------------------------------------------------- TIMER --------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment