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

Don't like using == instead of equals() here, even though it's valid here. Fixed that.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@240 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-03-03 22:07:43 +00:00
parent 36a5e32021
commit f79bb97605
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/src/com/google/zxing/client/android/ResultHandler.java
View file

@ -55,7 +55,7 @@ final class ResultHandler extends Handler {
if (message.what == R.string.button_yes) { if (message.what == R.string.button_yes) {
Intent intent = null; Intent intent = null;
ParsedReaderResultType type = result.getType(); ParsedReaderResultType type = result.getType();
if (type == ParsedReaderResultType.ADDRESSBOOK) { if (type.equals(ParsedReaderResultType.ADDRESSBOOK)) {
AddressBookDoCoMoResult addressResult = (AddressBookDoCoMoResult) result; AddressBookDoCoMoResult addressResult = (AddressBookDoCoMoResult) result;
intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI); intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getName()); putExtra(intent, Contacts.Intents.Insert.NAME, addressResult.getName());
@ -63,7 +63,7 @@ final class ResultHandler extends Handler {
putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmail()); putExtra(intent, Contacts.Intents.Insert.EMAIL, addressResult.getEmail());
putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote()); putExtra(intent, Contacts.Intents.Insert.NOTES, addressResult.getNote());
putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress()); putExtra(intent, Contacts.Intents.Insert.POSTAL, addressResult.getAddress());
} else if (type == ParsedReaderResultType.BOOKMARK) { } else if (type.equals(ParsedReaderResultType.BOOKMARK)) {
// For now, we can only open the browser, and not actually add a bookmark // For now, we can only open the browser, and not actually add a bookmark
try { try {
intent = new Intent(Intent.VIEW_ACTION, intent = new Intent(Intent.VIEW_ACTION,
@ -71,14 +71,14 @@ final class ResultHandler extends Handler {
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
return; return;
} }
} else if (type == ParsedReaderResultType.URLTO) { } else if (type.equals(ParsedReaderResultType.URLTO)) {
try { try {
intent = new Intent(Intent.VIEW_ACTION, intent = new Intent(Intent.VIEW_ACTION,
new ContentURI(((URLTOResult) result).getURI())); new ContentURI(((URLTOResult) result).getURI()));
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
return; return;
} }
} else if (type == ParsedReaderResultType.EMAIL) { } else if (type.equals(ParsedReaderResultType.EMAIL)) {
EmailDoCoMoResult emailResult = (EmailDoCoMoResult) result; EmailDoCoMoResult emailResult = (EmailDoCoMoResult) result;
try { try {
intent = new Intent(Intent.SENDTO_ACTION, new ContentURI(emailResult.getTo())); intent = new Intent(Intent.SENDTO_ACTION, new ContentURI(emailResult.getTo()));
@ -87,14 +87,14 @@ final class ResultHandler extends Handler {
} }
putExtra(intent, "subject", emailResult.getSubject()); putExtra(intent, "subject", emailResult.getSubject());
putExtra(intent, "body", emailResult.getBody()); putExtra(intent, "body", emailResult.getBody());
} else if (type == ParsedReaderResultType.EMAIL_ADDRESS) { } else if (type.equals(ParsedReaderResultType.EMAIL_ADDRESS)) {
EmailAddressResult emailResult = (EmailAddressResult) result; EmailAddressResult emailResult = (EmailAddressResult) result;
try { try {
intent = new Intent(Intent.SENDTO_ACTION, new ContentURI(emailResult.getEmailAddress())); intent = new Intent(Intent.SENDTO_ACTION, new ContentURI(emailResult.getEmailAddress()));
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
return; return;
} }
} else if (type == ParsedReaderResultType.UPC) { } else if (type.equals(ParsedReaderResultType.UPC)) {
UPCParsedResult upcResult = (UPCParsedResult) result; UPCParsedResult upcResult = (UPCParsedResult) result;
try { try {
ContentURI uri = new ContentURI("http://www.upcdatabase.com/item.asp?upc=" + ContentURI uri = new ContentURI("http://www.upcdatabase.com/item.asp?upc=" +
@ -103,7 +103,7 @@ final class ResultHandler extends Handler {
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
return; return;
} }
} else if (type == ParsedReaderResultType.URI) { } else if (type.equals(ParsedReaderResultType.URI)) {
URIParsedResult uriResult = (URIParsedResult) result; URIParsedResult uriResult = (URIParsedResult) result;
try { try {
intent = new Intent(Intent.VIEW_ACTION, new ContentURI(uriResult.getURI())); intent = new Intent(Intent.VIEW_ACTION, new ContentURI(uriResult.getURI()));