diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs
index e6d604b..b887cd2 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs
@@ -1,17 +1,17 @@
/// Copyright 2019 Kopano b.v.
-///
+///
/// This program is free software: you can redistribute it and/or modify
/// it under the terms of the GNU Affero General Public License, version 3,
/// as published by the Free Software Foundation.
-///
+///
/// This program is distributed in the hope that it will be useful,
/// but WITHOUT ANY WARRANTY; without even the implied warranty of
/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
/// GNU Affero General Public License for more details.
-///
+///
/// You should have received a copy of the GNU Affero General Public License
/// along with this program.If not, see.
-///
+///
/// Consult LICENSE file for details
using System;
@@ -249,7 +249,7 @@ namespace Acacia.Features.GAB
}
}
-
+
public const string PROP_LAST_PROCESSED = "ZPushLastProcessed";
public const string PROP_SEQUENCE_CHUNK = "ZPushSequenceChunk";
@@ -607,6 +607,7 @@ namespace Acacia.Features.GAB
contact.Email1AddressType = "SMTP";
}
if (Get(value, "companyName") != null) contact.CompanyName = Get(value, "companyName");
+ if (Get(value, "department") != null) contact.Department = Get(value, "department");
if (Get(value, "officeLocation") != null) contact.OfficeLocation = Get(value, "officeLocation");
if (Get(value, "businessTelephoneNumber") != null) contact.BusinessTelephoneNumber = Get(value, "businessTelephoneNumber");
if (Get(value, "mobileTelephoneNumber") != null) contact.MobileTelephoneNumber = Get(value, "mobileTelephoneNumber");
@@ -622,6 +623,7 @@ namespace Acacia.Features.GAB
if (Get(value, "businessAddressPostalCode") != null) contact.BusinessAddressPostalCode = Get(value, "businessAddressPostalCode");
if (Get(value, "businessAddressPostOfficeBox") != null) contact.BusinessAddressPostOfficeBox = Get(value, "businessAddressPostOfficeBox");
if (Get(value, "businessAddressStateOrProvince") != null) contact.BusinessAddressState = Get(value, "businessAddressStateOrProvince");
+ if (Get(value, "businessAddressStreet") != null) contact.BusinessAddressStreet = Get(value, "businessAddressStreet");
if (Get(value, "language") != null) contact.Language = Get(value, "language");
// Thumbnail
@@ -879,7 +881,7 @@ namespace Acacia.Features.GAB
_items = null;
}
}
- }
+ }
public ItemCache(GABHandler gab)
{
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/IContactItem.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/IContactItem.cs
index 992017b..cc9584e 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/IContactItem.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/IContactItem.cs
@@ -1,17 +1,17 @@
/// Copyright 2016 Kopano b.v.
-///
+///
/// This program is free software: you can redistribute it and/or modify
/// it under the terms of the GNU Affero General Public License, version 3,
/// as published by the Free Software Foundation.
-///
+///
/// This program is distributed in the hope that it will be useful,
/// but WITHOUT ANY WARRANTY; without even the implied warranty of
/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
/// GNU Affero General Public License for more details.
-///
+///
/// You should have received a copy of the GNU Affero General Public License
/// along with this program.If not, see.
-///
+///
/// Consult LICENSE file for details
using System;
@@ -36,6 +36,7 @@ namespace Acacia.Stubs
string Email1Address { get; set; }
string Email1AddressType { get; set; }
string CompanyName { get; set; }
+ string Department { get; set; }
string JobTitle { get; set; }
string OfficeLocation { get; set; }
string BusinessTelephoneNumber { get; set; }
@@ -49,6 +50,7 @@ namespace Acacia.Stubs
string BusinessAddressPostalCode { get; set; }
string BusinessAddressPostOfficeBox { get; set; }
string BusinessAddressState { get; set; }
+ string BusinessAddressStreet { get; set; }
string Language { get; set; }
void SetPicture(string path);
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/OutlookWrappers/ContactItemWrapper.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/OutlookWrappers/ContactItemWrapper.cs
index 61fe85a..ed1df2a 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/OutlookWrappers/ContactItemWrapper.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Stubs/OutlookWrappers/ContactItemWrapper.cs
@@ -1,17 +1,17 @@
/// Copyright 2016 Kopano b.v.
-///
+///
/// This program is free software: you can redistribute it and/or modify
/// it under the terms of the GNU Affero General Public License, version 3,
/// as published by the Free Software Foundation.
-///
+///
/// This program is distributed in the hope that it will be useful,
/// but WITHOUT ANY WARRANTY; without even the implied warranty of
/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
/// GNU Affero General Public License for more details.
-///
+///
/// You should have received a copy of the GNU Affero General Public License
/// along with this program.If not, see.
-///
+///
/// Consult LICENSE file for details
using Acacia.Utils;
@@ -94,6 +94,12 @@ namespace Acacia.Stubs.OutlookWrappers
set { _item.CompanyName = value; }
}
+ public string Department
+ {
+ get { return _item.Department; }
+ set { _item.Department = value; }
+ }
+
public string JobTitle
{
get { return _item.JobTitle; }
@@ -172,6 +178,12 @@ namespace Acacia.Stubs.OutlookWrappers
set { _item.BusinessAddressState = value; }
}
+ public string BusinessAddressStreet
+ {
+ get { return _item.BusinessAddressStreet; }
+ set { _item.BusinessAddressStreet = value; }
+ }
+
public string Language
{
get { return _item.Language; }
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ContactStringReplacer.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ContactStringReplacer.cs
index 2fb6897..bf59041 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ContactStringReplacer.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ContactStringReplacer.cs
@@ -103,6 +103,7 @@ namespace Acacia.ZPush
if (token == "username") return _contact.CustomerID ?? "";
if (token == "title") return _contact.JobTitle ?? "";
if (token == "company") return _contact.CompanyName ?? "";
+ if (token == "department") return _contact.Department ?? "";
if (token == "office") return _contact.OfficeLocation ?? "";
if (token == "phone") return _contact.BusinessTelephoneNumber ?? _contact.MobileTelephoneNumber ?? "";
if (token == "primary_email") return _contact.Email1Address ?? "";
@@ -111,6 +112,7 @@ namespace Acacia.ZPush
if (token == "state") return _contact.BusinessAddressState ?? "";
if (token == "zipcode") return _contact.BusinessAddressPostalCode ?? "";
if (token == "country") return _contact.BusinessAddressState ?? "";
+ if (token == "street") return _contact.BusinessAddressStreet ?? "";
if (token == "phone_business") return _contact.BusinessTelephoneNumber ?? "";
if (token == "phone_fax") return _contact.BusinessFaxNumber ?? "";
if (token == "phone_home") return _contact.HomeTelephoneNumber ?? "";