From 073f883ba6f3711c06fd72028c9187c6147d5a1b Mon Sep 17 00:00:00 2001
From: Patrick Simpson
Date: Mon, 5 Feb 2018 13:49:19 +0200
Subject: [PATCH] Fix for updated share separator for whole stores
---
.../AcaciaZPushPlugin/ZPush/GABUser.cs | 14 ++++++++++++--
.../AcaciaZPushPlugin/ZPush/ZPushAccount.cs | 4 ++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/GABUser.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/GABUser.cs
index fd3ff98..8295a0e 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/GABUser.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/GABUser.cs
@@ -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()
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
index 4395ffc..0e00160 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
@@ -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);
}
}