From 0e507c4b0c7269e439c14b822bdb1efbb9c36e03 Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Tue, 14 May 2013 12:33:49 +0000 Subject: [PATCH] Avoid NPE on null phone number git-svn-id: https://zxing.googlecode.com/svn/trunk@2795 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../zxing/client/android/result/AddressBookResultHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java b/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java index 579225d6b..cb4b8e7a2 100644 --- a/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java @@ -187,7 +187,9 @@ public final class AddressBookResultHandler extends ResultHandler { String[] numbers = result.getPhoneNumbers(); if (numbers != null) { for (String number : numbers) { - ParsedResult.maybeAppend(PhoneNumberUtils.formatNumber(number), contents); + if (number != null) { + ParsedResult.maybeAppend(PhoneNumberUtils.formatNumber(number), contents); + } } } ParsedResult.maybeAppend(result.getEmails(), contents);