frodovdr
/
kopano-ol-extension
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for updated share separator for whole stores

This commit is contained in:
Patrick Simpson 2018-02-05 13:49:19 +02:00
parent 7247d3f8d0
commit 073f883ba6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/GABUser.cs
View File

@ -91,13 +91,23 @@ namespace Acacia.ZPush
public override bool Equals(object obj)
{
if (obj is GABUser)
return UserName.Equals(((GABUser)obj).UserName);
return IdentityString.Equals(((GABUser)obj).IdentityString);
return false;
}
private string IdentityString
{
get
{
return (UserName ?? EmailAddress ?? FullName);
}
}
public override int GetHashCode()
{
return UserName.GetHashCode();
if (IdentityString == null)
return 0;
return IdentityString.GetHashCode();
}
public override string ToString()

4
src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
View File

@ -222,11 +222,11 @@ namespace Acacia.ZPush
{
if (ShareFor == null)
return null;
int index = Account.UserName.IndexOf("+share+");
int index = Account.UserName.IndexOf("#");
if (index < 0)
return null;
return Account.UserName.Substring(index + 7);
return Account.UserName.Substring(index + 1);
}
}