fix comments. and send again. https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/qa/... File spfaq/src/app/shoppoke/faq/qa/StorePhone.java (right): https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/qa/... spfaq/src/app/shoppoke/faq/qa/StorePhone.java:80: public static List<StorePhone> getDepartment(Context activity, getDepartment name does not make any sense. https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/qa/... spfaq/src/app/shoppoke/faq/qa/StorePhone.java:80: public static List<StorePhone> getDepartment(Context activity, it should return only one store. first store in the list. https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... File spfaq/src/app/shoppoke/faq/receiver/PhoneCallReceiver.java (right): https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... spfaq/src/app/shoppoke/faq/receiver/PhoneCallReceiver.java:48: incomingNumber); change accordingly. https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... File spfaq/src/app/shoppoke/faq/receiver/SmsPhoneReceiverHandler.java (right): https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... spfaq/src/app/shoppoke/faq/receiver/SmsPhoneReceiverHandler.java:40: if (storeId > 0) { no need to fetch storeId, just check item != null.. https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... spfaq/src/app/shoppoke/faq/receiver/SmsPhoneReceiverHandler.java:49: StoreResponseObject sro = StoreResponseObject.getStoreDBUtil( item is sro. no need to make a db query. https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... spfaq/src/app/shoppoke/faq/receiver/SmsPhoneReceiverHandler.java:51: if (sro == null) { remove these toasts. https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... File spfaq/src/app/shoppoke/faq/receiver/SmsReceiver.java (right): https://codereview.appspot.com/90230043/diff/1/spfaq/src/app/shoppoke/faq/rec... spfaq/src/app/shoppoke/faq/receiver/SmsReceiver.java:48: List<StorePhone> localContactList = new ArrayList<StorePhone>(); why are you doing this thing? fetching storephones. no need to do this.