Don't crash if servald returns a null name

rom1v · Feb 15, 2013 · c0cf18e · c0cf18e
1 parent d258be1
commit c0cf18e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/org/servalproject/rhizome/FilteredCursor.java b/src/org/servalproject/rhizome/FilteredCursor.java
@@ -21,6 +21,8 @@ public FilteredCursor(Cursor existing) {
 
 		while (existing.moveToNext()) {
 			String name = existing.getString(name_col);
+			if (name == null || "".equals(name))
+				name = "[blank]";
 			long fileSize = existing.getLong(size_col);
 
 			if (fileSize == 0 || name.startsWith(".")

diff --git a/src/org/servalproject/wizard/SetPhoneNumber.java b/src/org/servalproject/wizard/SetPhoneNumber.java
@@ -139,8 +139,8 @@ protected Boolean doInBackground(Void... params) {
 						} catch (IllegalArgumentException e) {
 							app.displayToastMessage(e.getMessage());
 						} catch (Exception e) {
-							Log.e("BatPhone", e.toString(), e);
-							app.displayToastMessage(e.toString());
+							Log.e("BatPhone", e.getMessage(), e);
+							app.displayToastMessage(e.getMessage());
 						}
 						return false;
 					}