Fixing a bug and cleaning up code.

Android's TextView doesn't handle null values very well. Also
simplified the "nothing to display" code and moved adapter notification
out of loops.