Skip to content

Commit

Permalink
zcs
Browse files Browse the repository at this point in the history
  • Loading branch information
rendurama committed Jul 5, 2024
1 parent eb98e60 commit 95097bc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
4 changes: 2 additions & 2 deletions store/conf/attrs/zimbra-attrs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10555,8 +10555,8 @@ TODO: delete them permanently from here
<defaultCOSValue>TRUE</defaultCOSValue>
<desc>Feature to enable/disable the mobile sync for shared folders. Default value is TRUE. The option to sync the shared folders to the Mobile will be enabled for the users in the webclient. The option will only be enabled for shared folders having Admin or Manager permission</desc>
</attr>
<attr id="4135" name="zimbraHideAliasInGal" type="boolean" cardinality="single" requiredIn="alias" since="10.1.1">

<attr id="4135" name="zimbraHideAliasInGal" type="boolean" cardinality="single" requiredIn="alias" since="10.1.1">
<desc> Option to hide/show alias in GAL</desc>

</attr>
Expand Down
14 changes: 4 additions & 10 deletions store/src/java/com/zimbra/cs/mailbox/ContactAutoComplete.java
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ public AutoCompleteCallback(String str, AutoCompleteResult result, GalSearchPara
this.str = str;
}

public void handleContactAttrs(Map<String, ? extends Object> attrs) {
public void handleContactAttrs(Map<String, ? extends Object> attrs) throws ServiceException {
addMatchedContacts(str, attrs, FOLDER_ID_GAL, null, result);
}

Expand Down Expand Up @@ -669,7 +669,7 @@ private Pattern toPattern(List<String> tokens) {
}

public void addMatchedContacts(String query, Map<String, ? extends Object> attrs, int folderId, ItemId id,
AutoCompleteResult result) {
AutoCompleteResult result) throws ServiceException {
if (!result.canBeCached) {
return;
}
Expand Down Expand Up @@ -704,17 +704,11 @@ public void addMatchedContacts(String query, Map<String, ? extends Object> attrs
String company = getFieldAsString(attrs, ContactConstants.A_company);
String fileas = getFieldAsString(attrs, ContactConstants.A_fileAs);
String displayName = fullName;
Account account = Provisioning.getInstance().get(Key.AccountBy.name, fullName);

if (Strings.isNullOrEmpty(displayName)) {
displayName = Joiner.on(' ').skipNulls().join(first, middle, last);
}
Account account;
try {
account = Provisioning.getInstance().get(Key.AccountBy.name, fullName);
}
catch (ServiceException e) {
throw new RuntimeException(e);
}


List<String> allowedEmailsList = new ArrayList<>();
for(String emailKey: mEmailKeys) {
Expand Down

0 comments on commit 95097bc

Please sign in to comment.