Issue 295 and Issue 294, treat ADR as wholly different addresses, not 2 lines of...

git-svn-id: http://zxing.googlecode.com/svn/trunk@1150 59b500cc-1b3d-0410-9834-0bbf25fbcc57

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 16df105..83c74fd 100644 (file)
--- a/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
@@ -108,18 +108,20 @@ public final class AddressBookResultHandler extends ResultHandler {
   @Override
   public void handleButtonPress(int index) {
     AddressBookParsedResult addressResult = (AddressBookParsedResult) getResult();
+    String[] addresses = addressResult.getAddresses();
+    String address1 = addresses == null || addresses.length < 1 ? null : addresses[0];
     int action = mapIndexToAction(index);
     switch (action) {
       case 0:
         addContact(addressResult.getNames(), addressResult.getPhoneNumbers(),
             addressResult.getEmails(), addressResult.getNote(),
-            addressResult.getAddress(), addressResult.getOrg(),
+            address1, addressResult.getOrg(),
             addressResult.getTitle());
         break;
       case 1:
         String[] names = addressResult.getNames();
         String title = names != null ? names[0] : null;
-        searchMap(addressResult.getAddress(), title);
+        searchMap(address1, title);
         break;
       case 2:
         dialPhone(addressResult.getPhoneNumbers()[0]);
@@ -149,7 +151,7 @@ public final class AddressBookResultHandler extends ResultHandler {
 
     ParsedResult.maybeAppend(result.getTitle(), contents);
     ParsedResult.maybeAppend(result.getOrg(), contents);
-    ParsedResult.maybeAppend(result.getAddress(), contents);
+    ParsedResult.maybeAppend(result.getAddresses(), contents);
     String[] numbers = result.getPhoneNumbers();
     if (numbers != null) {
       for (String number : numbers) {

diff --git a/core/src/com/google/zxing/client/result/AddressBookParsedResult.java b/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
index 8f39e62..c84587a 100644 (file)
--- a/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
+++ b/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
@@ -85,20 +85,6 @@ public final class AddressBookParsedResult extends ParsedResult {
     return addresses;
   }
 
-  public String getAddress() {
-    if (addresses == null || addresses.length == 0) {
-      return null;
-    }
-    StringBuffer result = new StringBuffer();
-    for (int i = 0; i < addresses.length; i++) {
-      if (result.length() > 0) {
-        result.append(' ');
-      }
-      result.append(addresses[i]);
-    }
-    return result.toString();
-  }
-
   public String getTitle() {
     return title;
   }