mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 04:54:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue 250: Provided a choice of creating a new contact or merging with an existing one.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1768 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2011-05-12 15:03:03 +00:00
parent 6a334eccf4
commit e7b14f7443
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/assets/html/whatsnew.html
View file

@ -10,6 +10,7 @@
<li>Added support for many more locales for web search and product search.</li> <li>Added support for many more locales for web search and product search.</li>
<li>Added Hebrew translation.</li> <li>Added Hebrew translation.</li>
<li>Fixed support for the Motorola Xoom tablet.</li> <li>Fixed support for the Motorola Xoom tablet.</li>
<li>Provided a choice of creating a new contact or merging with an existing one.</li>
<li>Other minor fixes.</li> <li>Other minor fixes.</li>
</ul> </ul>
<p><b>New in version 3.53:</b></p> <p><b>New in version 3.53:</b></p>

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

@ -238,20 +238,12 @@ public abstract class ResultHandler {
} }
} }
private static long lastSecondOfDay(long time) {
Calendar timeInDay = Calendar.getInstance();
timeInDay.setTimeInMillis(time);
timeInDay.set(Calendar.HOUR_OF_DAY, timeInDay.getActualMaximum(Calendar.HOUR_OF_DAY));
timeInDay.set(Calendar.MINUTE, timeInDay.getActualMaximum(Calendar.MINUTE));
timeInDay.set(Calendar.SECOND, timeInDay.getActualMaximum(Calendar.SECOND));
return timeInDay.getTimeInMillis();
}
final void addContact(String[] names, String[] phoneNumbers, String[] emails, String note, final void addContact(String[] names, String[] phoneNumbers, String[] emails, String note,
String address, String org, String title) { String address, String org, String title) {
// Only use the first name in the array, if present. // Only use the first name in the array, if present.
Intent intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI); Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT, Contacts.CONTENT_URI);
intent.setType(Contacts.People.CONTENT_ITEM_TYPE);
putExtra(intent, Contacts.Intents.Insert.NAME, names != null ? names[0] : null); putExtra(intent, Contacts.Intents.Insert.NAME, names != null ? names[0] : null);
int phoneCount = Math.min((phoneNumbers != null) ? phoneNumbers.length : 0, int phoneCount = Math.min((phoneNumbers != null) ? phoneNumbers.length : 0,
@ -470,4 +462,4 @@ public abstract class ResultHandler {
return url; return url;
} }
} }