sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removes some functions only available in newer macosx versions.

Browse Source
cusax-fix
Damian Minkov 13 years ago
parent 403644d476
commit d22a03ecbd
3 changed files with 58 additions and 193 deletions
Show Stats Download Patch File Download Diff File

BIN
lib/native/mac/libjmacosxaddrbook.jnilib
View File

Binary file not shown.

61
src/native/addrbook/macosx/net_java_sip_communicator_plugin_addrbook_macosx_MacOSXAddrBookContactQuery.m
Unescape View File

@ -198,7 +198,6 @@ JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_plugin_addrbook_macosx
{
data = [NSDate dateWithTimeIntervalSince1970:(jlong)value];
}
//else if(property == kABBirthdayComponentsProperty: not used for now
else if(property == kABURLsProperty
|| property == kABCalendarURIsProperty
|| property == kABEmailProperty
@ -248,53 +247,6 @@ JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_plugin_addrbook_macosx
withLabel:JavaStringToNSString(jniEnv, subProperty)];
}
//else if(property == kABOtherDatesProperty)//kABMultiDateProperty
//else if(property == kABOtherDateComponentsProperty: not used for now
else if(property == kABInstantMessageProperty)
{
jobjectArray arr = (jobjectArray)value;
jsize propertyCount = (*jniEnv)->GetArrayLength(jniEnv, arr);
data=[[ABMutableMultiValue alloc] init];
// The values are
// kABInstantMessageUsernameKey -> the user set username
// kABInstantMessageServiceKey -> one of
// (kABInstantMessageServiceICQ,
// kABInstantMessageServiceJabber,
// kABInstantMessageServiceGoogleTalk
// ...)
for (i = 0; i < propertyCount; i+=4)
{
NSMutableDictionary *addr;
addr = [NSMutableDictionary dictionary];
jstring value = (jstring) (*jniEnv)->GetObjectArrayElement(
jniEnv, arr, i);
jstring label = (jstring) (*jniEnv)->GetObjectArrayElement(
jniEnv, arr, i+1);
jstring value2 = (jstring) (*jniEnv)->GetObjectArrayElement(
jniEnv, arr, i+2);
jstring label2 = (jstring) (*jniEnv)->GetObjectArrayElement(
jniEnv, arr, i+3);
//NSLog(@"key:%@, value:%@", JavaStringToNSString(jniEnv, label), JavaStringToNSString(jniEnv, value));
if(label)
[addr setObject:JavaStringToNSString(jniEnv, value)
forKey:JavaStringToNSString(jniEnv, label)];
if(label2)
[addr setObject:JavaStringToNSString(jniEnv, value2)
forKey:JavaStringToNSString(jniEnv, label2)];
[(ABMutableMultiValue *) data
addValue:addr
withLabel:JavaStringToNSString(jniEnv, subProperty)];
}
}
/*else if(property == kABSocialProfileProperty)
{
// kABSocialProfileURLKey, kABSocialProfileServiceKey,
// kABSocialProfileUsernameKey, kABSocialProfileUserIdentifierKey
}*/
else
{
data = NULL;
@ -362,7 +314,6 @@ DEFINE_ABPERSON_PROPERTY_GETTER(kABPhoneProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABYahooInstantProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABMaidenNameProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABBirthdayProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABBirthdayComponentsProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABJobTitleProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABHomePageProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABURLsProperty)
@ -372,7 +323,6 @@ DEFINE_ABPERSON_PROPERTY_GETTER(kABOtherDatesProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABOtherDateComponentsProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABRelatedNamesProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABDepartmentProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABInstantMessageProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABNoteProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABSocialProfileProperty)
DEFINE_ABPERSON_PROPERTY_GETTER(kABTitleProperty)
@ -422,14 +372,6 @@ DEFINE_ABLABEL_PROPERTY_GETTER(kABYahooWorkLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABYahooHomeLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABICQWorkLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABICQHomeLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceAIM)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceFacebook)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceGoogleTalk)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceICQ)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceJabber)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceMSN)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceSkype)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceYahoo)
DEFINE_ABLABEL_PROPERTY_GETTER(kABAddressStreetKey)
DEFINE_ABLABEL_PROPERTY_GETTER(kABAddressCityKey)
DEFINE_ABLABEL_PROPERTY_GETTER(kABAddressZIPKey)
@ -437,9 +379,6 @@ DEFINE_ABLABEL_PROPERTY_GETTER(kABAddressCountryKey)
DEFINE_ABLABEL_PROPERTY_GETTER(kABWorkLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABHomeLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABOtherLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABMobileMeLabel)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageUsernameKey)
DEFINE_ABLABEL_PROPERTY_GETTER(kABInstantMessageServiceKey)
static void
MacOSXAddrBookContactQuery_idToJObject

190
src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactQuery.java
Unescape View File

@ -54,17 +54,14 @@ public class MacOSXAddrBookContactQuery
kABOrganizationProperty(),
kABMaidenNameProperty(),
kABBirthdayProperty(),
kABBirthdayComponentsProperty(),
kABJobTitleProperty(),
kABHomePageProperty(),
kABURLsProperty(),
kABCalendarURIsProperty(),
kABAddressProperty(),
kABOtherDatesProperty(),
kABOtherDateComponentsProperty(),
kABRelatedNamesProperty(),
kABDepartmentProperty(),
kABInstantMessageProperty(),
kABNoteProperty(),
kABSocialProfileProperty(),
kABTitleProperty(),
@ -191,95 +188,77 @@ public class MacOSXAddrBookContactQuery
*/
private static final int kABBirthdayProperty = 17;
/**
* The index of the <tt>kABBirthdayComponentsProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABBirthdayComponentsProperty = 18;
/**
* The index of the <tt>kABJobTitleProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABJobTitleProperty = 19;
private static final int kABJobTitleProperty = 18;
/**
* The index of the <tt>kABHomePageProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABHomePageProperty = 20;
private static final int kABHomePageProperty = 19;
/**
* The index of the <tt>kABURLsProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABURLsProperty = 21;
private static final int kABURLsProperty = 20;
/**
* The index of the <tt>kABCalendarURIsProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABCalendarURIsProperty = 22;
private static final int kABCalendarURIsProperty = 21;
/**
* The index of the <tt>kABAddressProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABAddressProperty = 23;
private static final int kABAddressProperty = 22;
/**
* The index of the <tt>kABOtherDatesProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABOtherDatesProperty = 24;
/**
* The index of the <tt>kABOtherDateComponentsProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABOtherDateComponentsProperty = 25;
private static final int kABOtherDatesProperty = 23;
/**
* The index of the <tt>kABRelatedNamesProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABRelatedNamesProperty = 26;
private static final int kABRelatedNamesProperty = 24;
/**
* The index of the <tt>kABDepartmentProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABDepartmentProperty = 27;
/**
* The index of the <tt>kABInstantMessageProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABInstantMessageProperty = 28;
private static final int kABDepartmentProperty = 25;
/**
* The index of the <tt>kABNoteProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABNoteProperty = 29;
private static final int kABNoteProperty = 26;
/**
* The index of the <tt>kABSocialProfileProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABSocialProfileProperty = 30;
private static final int kABSocialProfileProperty = 27;
/**
* The index of the <tt>kABTitleProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABTitleProperty = 31;
private static final int kABTitleProperty = 28;
/**
* The index of the <tt>kABSuffixProperty</tt> <tt>ABPerson</tt>
* property in {@link #ABPERSON_PROPERTIES}.
*/
private static final int kABSuffixProperty = 32;
private static final int kABSuffixProperty = 29;
/**
* The regex which matches the superfluous parts of an <tt>ABMultiValue</tt>
@ -414,10 +393,6 @@ private ContactDetail createContactDetail(
sc = ContactDetail.SubCategory.Yahoo;
c = ContactDetail.Category.InstantMessaging;
break;
case kABInstantMessageProperty:
sc = ContactDetail.SubCategory.fromString(contactAddress);
c = ContactDetail.Category.InstantMessaging;
break;
case kABMaidenNameProperty:
case kABFirstNameProperty:
sc = ContactDetail.SubCategory.Name;
@ -629,9 +604,6 @@ private void parseMultiDetails(
Object l = multiValue[multiValueIndex + 1];
if(kABInstantMessageServiceKey().equals(l))
continue;
contactDetails.add(
setCapabilities(
createContactDetail(
@ -897,13 +869,6 @@ else if (value instanceof Object[])
*/
private static native long kABBirthdayProperty();
/**
* Gets the value of the <tt>kABBirthdayComponentsProperty</tt> constant.
*
* @return the value of the <tt>kABBirthdayComponentsProperty</tt> constant
*/
private static native long kABBirthdayComponentsProperty();
/**
* Gets the value of the <tt>kABJobTitleProperty</tt> constant.
*
@ -946,13 +911,6 @@ else if (value instanceof Object[])
*/
private static native long kABOtherDatesProperty();
/**
* Gets the value of the <tt>kABOtherDateComponentsProperty</tt> constant.
*
* @return the value of the <tt>kABOtherDateComponentsProperty</tt> constant
*/
private static native long kABOtherDateComponentsProperty();
/**
* Gets the value of the <tt>kABRelatedNamesProperty</tt> constant.
*
@ -1014,21 +972,10 @@ else if (value instanceof Object[])
private static native String kABHomeLabel();
private static native String kABWorkLabel();
private static native String kABOtherLabel();
private static native String kABMobileMeLabel();
private static native String kABInstantMessageServiceAIM();
private static native String kABInstantMessageServiceFacebook();
private static native String kABInstantMessageServiceGoogleTalk();
private static native String kABInstantMessageServiceICQ();
private static native String kABInstantMessageServiceJabber();
private static native String kABInstantMessageServiceMSN();
private static native String kABInstantMessageServiceSkype();
private static native String kABInstantMessageServiceYahoo();
private static native String kABAddressStreetKey();
private static native String kABAddressCityKey();
private static native String kABAddressZIPKey();
private static native String kABAddressCountryKey();
private static native String kABInstantMessageUsernameKey();
private static native String kABInstantMessageServiceKey();
/**
@ -1337,7 +1284,19 @@ else if(subCategories.contains(ContactDetail.SubCategory.HomePage))
case Email:
return kABEmailProperty;
case InstantMessaging:
return kABInstantMessageProperty;
if(subCategories.contains(ContactDetail.SubCategory.AIM))
return kABAIMInstantProperty;
else if(subCategories.contains(ContactDetail.SubCategory.ICQ))
return kABICQInstantProperty;
else if(subCategories.contains(ContactDetail.SubCategory.MSN))
return kABMSNInstantProperty;
else if(subCategories.contains(
ContactDetail.SubCategory.Jabber))
return kABJabberInstantProperty;
else if(subCategories.contains(
ContactDetail.SubCategory.Yahoo))
return kABYahooInstantProperty;
break;
case Phone:
return kABPhoneProperty;
case Address:
@ -1355,7 +1314,8 @@ else if(subCategories.contains(ContactDetail.SubCategory.HomePage))
*/
public static String getLabel(
int property,
AddressBookContactDetail.SubCategory subCategory)
AddressBookContactDetail.SubCategory subCategory,
String subProperty)
{
switch(property)
{
@ -1365,28 +1325,12 @@ public static String getLabel(
if(subCategory == ContactDetail.SubCategory.Work)
return kABEmailWorkLabel();
break;
case kABInstantMessageProperty:
switch(subCategory)
{
case AIM:
return kABInstantMessageServiceAIM();
case Facebook:
return kABInstantMessageServiceFacebook();
case GoogleTalk:
return kABInstantMessageServiceGoogleTalk();
case ICQ:
return kABInstantMessageServiceICQ();
case Jabber:
return kABInstantMessageServiceJabber();
case MSN:
return kABInstantMessageServiceMSN();
case Skype:
return kABInstantMessageServiceSkype();
case Yahoo:
return kABInstantMessageServiceYahoo();
default:
return null;
}
case kABICQInstantProperty:
case kABAIMInstantProperty:
case kABYahooInstantProperty:
case kABMSNInstantProperty:
case kABJabberInstantProperty:
return subProperty;
case kABPhoneProperty:
if(subCategory == ContactDetail.SubCategory.Home)
return kABPhoneHomeLabel();
@ -1476,39 +1420,31 @@ public void addContactDetail(ContactDetail detail)
List<ContactDetail> details =
getContactDetails(detail.getCategory());
boolean isIM = (property == kABICQInstantProperty
|| property == kABAIMInstantProperty
|| property == kABYahooInstantProperty
|| property == kABMSNInstantProperty
|| property == kABJabberInstantProperty);
// first add existing one
ArrayList values = new ArrayList();
for(ContactDetail cd : details)
{
if(subProperty != null
&& cd instanceof AddressBookContactDetail
&& !subProperty.equals(
((AddressBookContactDetail) cd)
.getSubPropertyLabel()))
{
continue;
}
String det = cd.getDetail();
for(ContactDetail.SubCategory sub : cd.getSubCategories())
{
String label = getLabel(property, sub);
// if its an im property check also if the detail
// is the same subcategory (which is icq, yahoo, ...)
if(isIM && !detail.getSubCategories().contains(sub))
continue;
String label = getLabel(property, sub, subProperty);
if(label != null)
{
if(property == kABInstantMessageProperty)
{
values.add(det);
values.add(kABInstantMessageUsernameKey());
values.add(label);
values.add(kABInstantMessageServiceKey());
}
else
{
values.add(det);
values.add(label);
}
values.add(det);
values.add(label);
}
else
logger.warn("Missing label fo prop:" + property
@ -1519,21 +1455,11 @@ public void addContactDetail(ContactDetail detail)
// now the new value to add
for(ContactDetail.SubCategory sub : detail.getSubCategories())
{
String label = getLabel(property, sub);
String label = getLabel(property, sub, subProperty);
if(label != null)
{
if(property == kABInstantMessageProperty)
{
values.add(detail.getDetail());
values.add(kABInstantMessageUsernameKey());
values.add(label);
values.add(kABInstantMessageServiceKey());
}
else
{
values.add(detail.getDetail());
values.add(label);
}
values.add(detail.getDetail());
values.add(label);
}
else
logger.warn("Missing label fo prop:" + property
@ -1555,13 +1481,13 @@ public void addContactDetail(ContactDetail detail)
= detail.getSubCategories();
contactDetails.add(
new AddressBookContactDetail(
property,
detail.getDetail(),
detail.getCategory(),
subCategories.toArray(
new ContactDetail.SubCategory[
subCategories.size()]),
null));
property,
detail.getDetail(),
detail.getCategory(),
subCategories.toArray(
new ContactDetail.SubCategory[
subCategories.size()]),
null));
}
/**
@ -1665,7 +1591,7 @@ public void setDetail(String value)
for(ContactDetail.SubCategory sub : cd.getSubCategories())
{
String label = getLabel(property, sub);
String label = getLabel(property, sub, subPropertyLabel);
if(label != null)
{

Write Preview
Loading…
Cancel
Save