mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1150 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-12-10 15:50:54 +00:00
parent 460abab4ed
commit ef4cdf1969
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
View file

@ -108,18 +108,20 @@ public final class AddressBookResultHandler extends ResultHandler {
@Override @Override
public void handleButtonPress(int index) { public void handleButtonPress(int index) {
AddressBookParsedResult addressResult = (AddressBookParsedResult) getResult(); AddressBookParsedResult addressResult = (AddressBookParsedResult) getResult();
String[] addresses = addressResult.getAddresses();
String address1 = addresses == null || addresses.length < 1 ? null : addresses[0];
int action = mapIndexToAction(index); int action = mapIndexToAction(index);
switch (action) { switch (action) {
case 0: case 0:
addContact(addressResult.getNames(), addressResult.getPhoneNumbers(), addContact(addressResult.getNames(), addressResult.getPhoneNumbers(),
addressResult.getEmails(), addressResult.getNote(), addressResult.getEmails(), addressResult.getNote(),
addressResult.getAddress(), addressResult.getOrg(), address1, addressResult.getOrg(),
addressResult.getTitle()); addressResult.getTitle());
break; break;
case 1: case 1:
String[] names = addressResult.getNames(); String[] names = addressResult.getNames();
String title = names != null ? names[0] : null; String title = names != null ? names[0] : null;
searchMap(addressResult.getAddress(), title); searchMap(address1, title);
break; break;
case 2: case 2:
dialPhone(addressResult.getPhoneNumbers()[0]); dialPhone(addressResult.getPhoneNumbers()[0]);
@ -149,7 +151,7 @@ public final class AddressBookResultHandler extends ResultHandler {
ParsedResult.maybeAppend(result.getTitle(), contents); ParsedResult.maybeAppend(result.getTitle(), contents);
ParsedResult.maybeAppend(result.getOrg(), contents); ParsedResult.maybeAppend(result.getOrg(), contents);
ParsedResult.maybeAppend(result.getAddress(), contents); ParsedResult.maybeAppend(result.getAddresses(), contents);
String[] numbers = result.getPhoneNumbers(); String[] numbers = result.getPhoneNumbers();
if (numbers != null) { if (numbers != null) {
for (String number : numbers) { for (String number : numbers) {

14
core/src/com/google/zxing/client/result/AddressBookParsedResult.java
View file

@ -85,20 +85,6 @@ public final class AddressBookParsedResult extends ParsedResult {
return addresses; 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() { public String getTitle() {
return title; return title;
} }