Removed references of CardDAV and delete ConnectionObject when finished

[xestiaab/.git] / source / actmgr / frmActivityMgr.h

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 493bdd1..9947ea4 100644 (file)
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -26,13 +26,24 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 
 #include <map>
 #include <wx/timer.h>
+#if defined(__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#include "../frmMain.h"
+#endif
 
 #include "../AppXestiaAddrBk.h"
-#include "../carddav/carddav.h"
 #include "../common/timers.h"
 #include "../common/etag.h"
 #include "../common/dirs.h"
 #include "../common/preferences.h"
+#include "../common/sslcertstructs.h"
+#include "../connobject/ConnectionObject.h"
+#include "../carddav2/carddav2.h"
+       
+#if defined(__WIN32__)
+#include "../common/win32ssl.h"
+#endif
 
 //// end generated include
 
@@ -43,6 +54,7 @@ DECLARE_EVENT_TYPE(ACTMGR_STOPTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_STARTPROCESSTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_STOPPROCESSTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_UPDATESTATUSLABEL, wxID_ANY)
+DECLARE_EVENT_TYPE(ACTMGR_STARTANIMATIONTIMER, wxID_ANY)
 
 struct vCardDownloadDataFileClass{
        unsigned int DataType = 0;
@@ -55,6 +67,15 @@ struct ActivityMgrLabelUpdate{
        wxString ItemDes;
 };
 
+#if defined(__APPLE__)
+struct SSLInvalidTrustNotifObj{
+        SecTrustRef SecurityTrustObject;
+        int *ResultValue;
+        bool *PausePtr;
+        wxString AccountName;
+};
+#endif
+
 struct ActivityMgrAccountSettings{
        wxString Address;
        int Port;
@@ -81,11 +102,13 @@ class frmActivityMgr : public frmActivityMgrADT
                std::map<int,int> ActivityListType;
                std::map<int,long> ActivityListIndex;
                std::map<int,wxString> ActivityListData;
+               std::map<int,wxString> ActivityListURL;
+               std::map<int,bool> ActivityListEditMode;
                std::map<int,wxString> ActivityListTaskDetail;
                std::map<int,wxString> ActivityListAccount;
                std::map<int,wxString> ActivityListFilename;
                std::map<int,wxString> ActivityListFullFilename;
-               std::map<int,CardDAV*> ActivityListConn;
+               std::map<int,ConnectionObject*> ActivityListConnObject;
                std::map<int,ActivityMgrAccountSettings> ActivityListAccSettings;
                std::map<int,wxString> ActivityListETag;
                std::map<int,wxString> ActivityListETagOriginal;
@@ -93,11 +116,14 @@ class frmActivityMgr : public frmActivityMgrADT
                std::map<int,wxArrayString> ActivityListLog;
                bool WindowOpen = FALSE;
                bool TasksActive = FALSE;
-               bool SleepMode = FALSE;
+               bool ApplicationSleepMode = FALSE;
                bool ProcessTasksData = FALSE;
                //int ConflictResult = 0;
                wxETagProcessTimer *ETagTmrPtr;
                void *frmMainPtr;
+#if defined(__APPLE__)
+                int DisplayTrustPanel(SecTrustRef SecurityTrustObject, wxString AccountNameFriendly);
+#endif
                //frmMain *frmMainPtr;
        protected:
                // Handlers for frmActivityMgrADT events.
@@ -110,11 +136,14 @@ class frmActivityMgr : public frmActivityMgrADT
                void StopTimer( wxCommandEvent& event );
                void StartProcessTimer( wxCommandEvent& event );
                void StopProcessTimer( wxCommandEvent& event );
+               void StartAnimationTimer(wxCommandEvent& event);
                void FlushAllTasks();
                void RemoveTask();
                void ProcessTasksThread();
                void ToggleConnectionStatus( wxCommandEvent& event );
+               void SleepMode( wxCommandEvent &event );
                void WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc);
+               void WriteServerCertificate(wxString AccountName, SSLCertCollectionString SSLCertInc);
                void UpdateStatusLabel( wxCommandEvent& event );
        public:
                /** Constructor */