Revert "Bug 1799: Master password prompt unintentionally appears when selecting site folder with a site with an encrypted password"

This reverts commit ac2057902d6298184a38aa8e1bfc596d9001bca3.

Fix requires CopyDataNoRecrypt which is not available in 5.15

Source commit: 0ae683aaf9066c3c716e66043788121424c3b66a

source/core/SessionData.cpp

@@ -4803,11 +4803,6 @@ TSessionData * __fastcall TStoredSessionList::CheckIsInFolderOrWorkspaceAndResol
 }
 //---------------------------------------------------------------------------
 void __fastcall TStoredSessionList::GetFolderOrWorkspace(const UnicodeString & Name, TList * List)
-{
-  DoGetFolderOrWorkspace(Name, List, false);
-}
-//---------------------------------------------------------------------------
-void __fastcall TStoredSessionList::DoGetFolderOrWorkspace(const UnicodeString & Name, TList * List, bool NoRecrypt)
 {
   for (int Index = 0; (Index < Count); Index++)
   {
@@ -4818,14 +4813,7 @@ void __fastcall TStoredSessionList::DoGetFolderOrWorkspace(const UnicodeString &
     if (Data != NULL)
     {
       TSessionData * Data2 = new TSessionData(L"");
-      if (NoRecrypt)
-      {
-        Data2->CopyDataNoRecrypt(Data);
-      }
-      else
-      {
-        Data2->Assign(Data);
-      }
+      Data2->Assign(Data);
 
       if (!RawData->Link.IsEmpty() && (DebugAlwaysTrue(Data != RawData)) &&
           // BACKWARD COMPATIBILITY
@@ -4857,7 +4845,7 @@ TStrings * __fastcall TStoredSessionList::GetFolderOrWorkspaceList(
   const UnicodeString & Name)
 {
   std::unique_ptr<TObjectList> DataList(new TObjectList());
-  DoGetFolderOrWorkspace(Name, DataList.get(), true);
+  GetFolderOrWorkspace(Name, DataList.get());
 
   std::unique_ptr<TStringList> Result(new TStringList());
   for (int Index = 0; (Index < DataList->Count); Index++)

source/core/SessionData.h

@@ -729,7 +729,6 @@ private:
   TSessionData * __fastcall CheckIsInFolderOrWorkspaceAndResolve(
     TSessionData * Data, const UnicodeString & Name);
   void __fastcall ImportLevelFromFilezilla(_di_IXMLNode Node, const UnicodeString & Path, _di_IXMLNode SettingsNode);
-  void __fastcall DoGetFolderOrWorkspace(const UnicodeString & Name, TList * List, bool NoRecrypt);
   static THierarchicalStorage * __fastcall CreateHostKeysStorageForWritting();
 };
 //---------------------------------------------------------------------------