mirror of
https://github.com/Kopano-dev/kopano-ol-extension.git
synced 2023-10-10 13:37:40 +02:00
Fix for updated share separator for whole stores
This commit is contained in:
parent
7247d3f8d0
commit
073f883ba6
@ -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()
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user