From c0170bf856c0298b9ba2dd2f848b781bb35fc0f9 Mon Sep 17 00:00:00 2001
From: Patrick Simpson
Date: Wed, 1 Mar 2017 10:21:48 +0100
Subject: [PATCH] Removed workaround for Z-Push not sending parent ids of
shared folders.
---
.../Features/SharedFolders/StoreTreeNode.cs | 2 +-
.../ZPush/API/SharedFolders/SharedFolder.cs | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
index 9a1610d..1b236c9 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
@@ -85,7 +85,7 @@ namespace Acacia.Features.SharedFolders
internal SharedFolder AddShare(AvailableFolder folder, SharedFolder state)
{
state = state ?? CreateDefaultShare(folder);
- _currentShares[folder.BackendId] = state.PatchInformation(folder);
+ _currentShares[folder.BackendId] = state;
CheckDirty();
return state;
}
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/API/SharedFolders/SharedFolder.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/API/SharedFolders/SharedFolder.cs
index 2d996d8..c74521a 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/API/SharedFolders/SharedFolder.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/API/SharedFolders/SharedFolder.cs
@@ -88,18 +88,6 @@ namespace Acacia.ZPush.API.SharedFolders
return _data;
}
- ///
- /// Patches in any information that is available on AvailableFolder, but not SharedFolder. This is specifically the parent id.
- ///
- public SharedFolder PatchInformation(AvailableFolder folder)
- {
- if (folder.ParentIdAsBackend != _data.parentid)
- {
- _data.parentid = folder.ParentIdAsBackend;
- }
- return this;
- }
-
#endregion
#region Setup