=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowSentSMSAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowSentSMSAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowSentSMSAction.java 2013-08-28 04:31:21 +0000 @@ -123,7 +123,7 @@ throws Exception { List tempListOutboundSMS = outboundSmsService.getAllOutboundSms(); - + listOutboundSMS = new ArrayList(); if ( filterStatusType != null && filterStatusType == 0 ) @@ -156,24 +156,24 @@ recipientNames = new ArrayList(); recipientNames.add( "" ); + String tempString; for ( OutboundSms outboundSms : listOutboundSMS ) { - String tempString = ""; + tempString = ""; for ( String phoneNumber : outboundSms.getRecipients() ) { - if ( userService.getUsersByPhoneNumber( phoneNumber ) == null - || userService.getUsersByPhoneNumber( phoneNumber ).size() == 0 ) + Collection users = userService.getUsersByPhoneNumber( phoneNumber ); + if ( users == null || users.size() == 0 ) { tempString += "[unknown]"; } - else if ( userService.getUsersByPhoneNumber( phoneNumber ) != null - && userService.getUsersByPhoneNumber( phoneNumber ).size() > 0 ) + else if ( users != null && users.size() > 0 ) { - Iterator users = userService.getUsersByPhoneNumber( phoneNumber ).iterator(); - while ( users.hasNext() ) + Iterator usersIterator = users.iterator(); + while ( usersIterator.hasNext() ) { - User user = users.next(); + User user = usersIterator.next(); tempString += "[" + user.getUsername() + "]"; } }