Commit Graph

4551 Commits

Author SHA1 Message Date
csoler
0af05d2517 patch to avoid re-asking for rejected plugins when the executable is upgraded. 2017-05-09 19:07:17 +02:00
csoler
34dd68d7bf Merge pull request #809 from csoler/v0.6-FT
fixed previous commit
2017-05-08 23:05:16 +02:00
csoler
e0cb0f4847 fixed previous commit 2017-05-08 23:04:04 +02:00
csoler
9a0df3f757 Merge pull request #804 from PhenomRetroShare/Fix_Warnings
Fix warnings
2017-05-08 22:21:28 +02:00
csoler
4a2f5f0f82 Merge pull request #808 from csoler/v0.6-FT
added a per-friend upload slots limit in FT. Default is 0=unlimited
2017-05-08 22:02:38 +02:00
csoler
8a86b9ed7d added a per-friend upload slots limit in FT. Default is 0=unlimited 2017-05-08 22:00:51 +02:00
Gioacchino Mazzurco
f67617a449 Add override and final placeolders for old GCC compatibility 2017-05-08 16:57:37 +02:00
Phenom
d02cba5a91 Fix Lobby Topic not send on invite. 2017-05-08 15:38:36 +02:00
Gioacchino Mazzurco
ccaf4881a8 Merge branch 'master' into qmlapp_pex_alpha 2017-05-08 13:38:29 +02:00
Phenom
4a2f688f14 Fix Windows Compilation:
pqi/authssl.cc: In member function 'virtual X509*
AuthSSLimpl::SignX509ReqWithGPG(X509_REQ*, long int)':
pqi/authssl.cc:929:3: error: jump to label 'err' [-fpermissive]
   err:
   ^
pqi/authssl.cc:872:22: error:   from here [-fpermissive]
                 goto err;
                      ^
pqi/authssl.cc:877:24: error:   crosses initialization of 'unsigned
char* p'
         unsigned char *p=buf_in;
                        ^
pqi/authssl.cc: In member function 'virtual bool
AuthSSLimpl::AuthX509WithGPG(X509*, uint32_t&)':
pqi/authssl.cc:1091:1: error: jump to label 'err' [-fpermissive]
 err:
 ^
pqi/authssl.cc:1027:8: error:   from here [-fpermissive]
   goto err;
        ^
pqi/authssl.cc:1035:17: error:   crosses initialization of 'unsigned
char* p'
  unsigned char *p=buf_in;
                 ^
2017-05-08 13:01:34 +02:00
Gioacchino Mazzurco
8f306346a4 Merge branch 'gxs_mail_experiments' into qmlapp_pex_alpha 2017-05-08 12:33:40 +02:00
Phenom
58c812aea8 Fix Warnings: unused parameter ‘s’
warning: unused parameter ‘s’ [-Wunused-parameter]
 template<> uint32_t RsTypeSerializer::serial_size(uint16_t /*
type_subtype */,const uint32_t& s)
                                                                                               ^
2017-05-08 12:17:01 +02:00
Phenom
ee7e92d6c4 Fix Warnings: this ‘if’ clause does not guard...
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(buffer.empty())
     ^~
2017-05-08 12:15:45 +02:00
Phenom
9b1209db68 Fix Warnings: unused parameter ‘s’ & 'n'
warning: unused parameter ‘s’ [-Wunused-parameter]
 template<> uint32_t RsTypeSerializer::serial_size(const
PeerBandwidthLimits& s)
                                                                              ^
2017-05-08 12:14:04 +02:00
Phenom
91e3cc3e5f Fix Warnings: variable ‘p’ set but not used
warning: variable ‘p’ set but not used [-Wunused-but-set-variable]
  unsigned char *p,*buf_in=NULL;
                 ^
2017-05-08 12:11:48 +02:00
Phenom
ca291b7ee6 Fix Warnings: warning: unused variable ‘i2d’
warning: unused variable ‘i2d’ [-Wunused-variable]
  int (*i2d)(X509_CINF*, unsigned char**) = i2d_X509_CINF;
        ^~~
2017-05-08 12:05:58 +02:00
Phenom
9021609a6b Fix Warnings: unused variable ‘p’
warning: unused variable ‘p’ [-Wunused-variable]
         unsigned char *p,*buf_in=NULL;
                        ^
2017-05-08 12:04:08 +02:00
Phenom
7892004641 Fix Warnings: unused parameter ‘member_name’
warning: unused parameter ‘member_name’ [-Wunused-parameter]
   static void serial_process(RsGenericSerializer::SerializeJob
j,RsGenericSerializer::SerializeContext& ctx,t_RsFlags32<N>& v,const
std::string& member_name)
                                                                                                                                                  ^~~~~~~~~~~
2017-05-08 12:04:08 +02:00
Phenom
381aca4197 Fix Warnings: unused parameter ‘j’, 'ctx' & 'name'
warning: unused parameter ‘j’ [-Wunused-parameter]
 void
RsChatLobbyListRequestItem::serial_process(RsGenericSerializer::SerializeJob
j,RsGenericSerializer::SerializeContext& ctx)
                                                                                   ^
2017-05-08 12:04:08 +02:00
Phenom
dd089a9683 Fix Warnings: this ‘if’ clause does not guard
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(service_id != RS_SERVICE_TYPE_CHAT)
     ^~
2017-05-08 12:04:08 +02:00
Phenom
5050d4f66a Fix Warnings: unused parameter ‘indent’
warning: unused parameter ‘indent’ [-Wunused-parameter]
         virtual std::ostream& print(std::ostream &out, uint16_t indent
= 0) { return out; } // derived from RsItem, but should be removed
                                                                          ^
2017-05-08 12:04:08 +02:00
Gioacchino Mazzurco
8e9b3c97d5 Fix missing include 2017-05-08 12:03:42 +02:00
Gioacchino Mazzurco
ea8f800003 Port GxsTrans to new serialization system
RsItem added some comment and more verbose error reporting
RsTypeSerializer added support for RsItem derived classes as members
  added utility macros for better readability of the code and easier
  handling of RsItem derived members
  RS_REGISTER_SERIAL_MEMBER(I)
  RS_REGISTER_SERIAL_MEMBER_TYPED(I, T)
  RS_REGISTER_ITEM_TYPE(T)

RsNxsMsg::serial_process use new macros for better readability and to
 have an exemple of usage with RsTlvItem derived class
Fix undefined reference to RsNxsMsg::print
2017-05-08 00:19:11 +02:00
csoler
b18a186c5f fixed ftExtraList to accept e2e encrypted transfers in addition to direct transfers. This fixed the drag+drop of shared files in a distant chat 2017-05-06 18:20:48 +02:00
csoler
59ac5a5bfa added on-the-fly fix of group privacy flags, so that edited groups with old un-set flags will be set automatically. Also fixes the bug preventing to grant membership on old circles 2017-05-06 16:51:38 +02:00
csoler
868c0467f2 fixed bug in serializer caused to not updating the size parameter. Also fixes unittests 2017-05-06 13:23:26 +02:00
csoler
f7f0d8ddd0 Merge pull request #800 from sehraf/pr-openssl-chacha20
add support for openssl's chacha20-poly1305 implementation
2017-05-05 23:10:07 +02:00
csoler
00c80b1c1e Merge pull request #797 from PhenomRetroShare/Fix_WindowsCompilation
Fix Windows Compilation
2017-05-05 23:06:25 +02:00
csoler
e4dde95621 Merge pull request #798 from PhenomRetroShare/Fix_TravisCompilation
Fix UnitTest compilation
2017-05-05 23:04:28 +02:00
sehraf
7371fdc432 add openssl chacha20 support 2017-05-05 21:01:19 +02:00
Gioacchino Mazzurco
f7f36f697e fixup! Merge branch 'master' into gxs_mail_experiments 2017-05-05 17:52:44 +02:00
Gioacchino Mazzurco
5159e326c7 Merge branch 'master' into gxs_mail_experiments 2017-05-05 15:44:22 +02:00
sehraf
96b4a1b2d8 add openssl chacha20-poly1305 support 2017-05-05 15:40:02 +02:00
csoler
e913f3689a fixed crash when trying to deserialize an empty buffer in rsrecogn 2017-05-04 21:40:32 +02:00
csoler
e6a7168122 merged upstream/master 2017-05-04 16:41:02 +02:00
Phenom
1c2b43b7e0 Fix UnitTest compilation
But running failed.
2017-05-04 15:01:25 +02:00
Phenom
d31b80c13a Fix Windows Compilation 2017-05-04 11:58:45 +02:00
csoler
4f4240d570 fixed bug in history serializer 2017-05-03 22:43:16 +02:00
csoler
214aaa7c9b added safety check for null chunks in TlvMemBlock_proxy deserialization 2017-05-03 22:20:58 +02:00
csoler
f006146ee4 merged upstream/master 2017-05-02 22:41:01 +02:00
csoler
4bee52c406 removed old unused serialization code 2017-05-02 22:34:45 +02:00
csoler
99d8b7d5d8 switched service control items to new serialization 2017-05-01 21:23:34 +02:00
csoler
3d17d31e49 Merge pull request #789 from PhenomRetroShare/Add_FriendTimeOffsetNewsFeed
Add Friend Time Offset news feed.
2017-04-30 22:43:10 +02:00
csoler
16b8947af1 improved serializer documentation 2017-04-30 20:31:43 +02:00
csoler
cecd9a3368 merged upstream/master 2017-04-30 20:14:23 +02:00
csoler
24c7c38016 removed old file rssrviceserialiser.h/cc 2017-04-30 20:08:30 +02:00
csoler
14076de1e0 moved code of rsservicerserialiser into rsserializer.h/cc and renamed it into RsRawSerializer 2017-04-30 19:17:44 +02:00
csoler
e401b90e02 moved rsserializer and rstypeserializer to serialiser/ 2017-04-30 16:05:37 +02:00
csoler
4f92f483fa dwicthed GxsTunnel items to new serialization 2017-04-29 23:02:44 +02:00
csoler
1159c863a2 moved wiki and wire items to rsitems/ 2017-04-29 21:50:55 +02:00
csoler
d58c638af8 switched wiki and wire items to new serialization 2017-04-29 21:46:54 +02:00
Phenom
77adc82aa2 Fix Missing messages when mark all as read.
If message get olders versions, these ones was not marked as read. So it
left unread messages on thread despite nothing appears on tree view.
2017-04-29 17:32:23 +02:00
csoler
5cba0059c8 moved recognitems to rsitems/ 2017-04-28 23:32:47 +02:00
csoler
23492698d4 switch rsrecognitems to new serialization 2017-04-28 23:28:56 +02:00
csoler
8341c68388 removed old code 2017-04-28 18:54:07 +02:00
csoler
688813fbf5 moved photo items to rsitems/ 2017-04-28 18:51:35 +02:00
csoler
634efb6142 switched rsphotoitems to new serialization 2017-04-28 18:42:11 +02:00
csoler
d3c960e4e7 removed old code 2017-04-28 17:48:54 +02:00
csoler
22e2416f3e moved rsserviceinfo items to rsitems/ 2017-04-28 17:47:41 +02:00
csoler
2d19783296 switched serviceinfo items to new serialization 2017-04-28 17:44:45 +02:00
csoler
c33c34b175 moved rspluginitems to rsitems/ 2017-04-28 16:44:04 +02:00
csoler
d32a8caf06 switched PluginItems to new serialization 2017-04-28 16:39:54 +02:00
csoler
45eaf27deb moved rsgxsupdateitems to rsitems/ 2017-04-28 16:30:33 +02:00
csoler
2e6766569d switched MsgUpdate items to new serialization 2017-04-28 16:26:59 +02:00
Gioacchino Mazzurco
3fddbaf070 Merge branch 'master' into qmlapp_pex_alpha 2017-04-28 13:26:31 +02:00
csoler
5995e508c5 moved rsstatusitem.h to rsitems/ 2017-04-27 21:24:27 +02:00
csoler
87018edeb2 switched rsstatusitem to new serializer 2017-04-27 21:20:30 +02:00
csoler
07a93be1b2 moved heartbeatitem.h to rsitems/ 2017-04-27 21:11:10 +02:00
csoler
9adbab3281 switched heartbeatitems to new serialization 2017-04-27 21:10:22 +02:00
Phenom
19b4fb892c Add Friend Time Offset news feed. 2017-04-27 16:42:25 +02:00
csoler
349d14b354 moved rsposteditems to rsitems/ 2017-04-27 14:44:41 +02:00
csoler
35ecc19677 switched rsposteditems to new serialization 2017-04-27 14:41:31 +02:00
csoler
22f6d150df moved rsnxsitems.cc to rsitems/ 2017-04-27 14:21:46 +02:00
csoler
3c20a85335 switched RsNxsItems to new serialization 2017-04-27 14:16:57 +02:00
csoler
f6e59f7dee moved gxsforumitems to rsitems/ 2017-04-27 11:59:18 +02:00
csoler
449a4209d9 dwitched gxsforum items to new serialization 2017-04-27 11:56:56 +02:00
csoler
f50670f773 moved circle items to rsitems/ 2017-04-26 20:59:59 +02:00
csoler
559137d05b switched gxscircleitems to new serialization 2017-04-26 20:57:28 +02:00
csoler
db645239cb moved rsgxschannel items to rsitems 2017-04-26 20:15:54 +02:00
csoler
69729ad7d2 switch Channel items to new serialization 2017-04-26 18:55:23 +02:00
csoler
77c2e6da8c improved error handlign in pqistore 2017-04-26 18:14:10 +02:00
csoler
8f97647246 fixed bug in RsGxsId deserialization 2017-04-26 15:43:00 +02:00
csoler
c31396a010 moved dsdv code to unused directory 2017-04-26 14:31:15 +02:00
csoler
508a2e2864 moved gxs comment and Id items to rsitems/ 2017-04-26 14:28:25 +02:00
csoler
97d0df0737 added comment about serialization hack 2017-04-26 14:19:34 +02:00
csoler
c0d8735251 switched RsGxsIdItems to new serialization 2017-04-26 14:17:38 +02:00
csoler
fb34fa19c0 switch GxsComment item to new serialization 2017-04-26 13:44:09 +02:00
csoler
9c610a736d cleaned the hierarchy of serialization classes 2017-04-26 11:40:46 +02:00
csoler
77e809ea4b switched GRouter to new serialization 2017-04-25 21:21:46 +02:00
Phenom
3592d5bf5d Fix GCC warnings: unused parameter ‘names’
/libretroshare/src/pqi/pqiservice.h:80: warning: unused parameter
‘names’ [-Wunused-parameter]
     virtual void getItemNames(std::map<uint8_t,std::string>& names)
const {} // This does nothing by default. Service should derive it in
order to give info for the UI
                                                              ^~~~~
2017-04-25 09:53:06 +02:00
csoler
0d7df568b4 moved rsconfigitems and rshistoryitems to rsitems/ 2017-04-24 22:47:08 +02:00
csoler
f7338d4a3d removed old code 2017-04-24 22:39:05 +02:00
csoler
43b3b87782 fixed a few bugs in config items 2017-04-24 22:36:03 +02:00
csoler
fcabe6359f switch RsConfigItems to new serialization 2017-04-24 18:51:51 +02:00
csoler
af4fcf7679 switched rshistoryitems to new serialization 2017-04-24 17:33:30 +02:00
csoler
8ae6541ceb added two new classes for config/service serialisers and a base generic serialiser class 2017-04-24 17:10:01 +02:00
csoler
dc2df071a5 renamed RsSerializer into RsServiceSerializer 2017-04-24 14:14:34 +02:00
csoler
976a80a7af switch rsfilelistitems to new serialization 2017-04-24 13:30:18 +02:00
csoler
26e95416d1 moved RTT items to rsitems/ 2017-04-24 11:06:51 +02:00
csoler
f6aaee7382 converted RTT items to new serialization 2017-04-24 11:01:45 +02:00
csoler
5071c4bc7f moved msgitems to rsitems/ 2017-04-24 11:00:57 +02:00
csoler
fc82b20833 removed old serialization code in msgs 2017-04-24 10:36:22 +02:00
csoler
08867945f3 fixed bug caused by wrong cast in lobby msg signature validation 2017-04-24 10:29:57 +02:00
csoler
91b04098b6 fixed two memory bugs in serialization code 2017-04-24 10:11:24 +02:00
csoler
31c07f4dfd converted RsMsgItems to new serialization. Added format and flag members to RsSerialiser and used the later to handle signature and config serialization techniques 2017-04-23 22:40:26 +02:00
csoler
63b4b3a1f7 moved discovery2 items to rsitems/ 2017-04-23 19:07:26 +02:00
csoler
9d9ff567bb switched discovery2items to new serialization 2017-04-23 19:02:12 +02:00
csoler
2e7127077d fixed previous file move 2017-04-22 21:36:39 +02:00
csoler
bef6db4b43 moved files 2017-04-22 21:32:57 +02:00
csoler
311f257090 converted GxsReputationItems to new serialization 2017-04-22 21:10:55 +02:00
csoler
782c02744f added names for turtle sub items 2017-04-22 16:00:01 +02:00
electron128
8b9c447063 fixed possible crash and return value in rsGetHostByName(), thanks to Kotyara for reporting this 2017-04-22 10:13:23 +02:00
csoler
5f8bf03dfe added mechanism to allow services to document the names of their items, and improved bandwidth graph to show names for GXS services. Other services still need to supply their own names 2017-04-20 20:54:51 +02:00
Gioacchino Mazzurco
5ee517b64f Expose libresapi for GXS contacts import/export
To import contact
/identity/import_key
{"radix":"AgIRBAAABd..."}

To export contact
/identity/export_key
{"gxs_id":"ffffffffffffffffffffffffffffffff"}

In both cases if everithing went fine the answer is something like
{"data":{"radix":"AgIRBAAABd...", "gxs_id":"fff..."}, "returncode":"ok"}

Some retrocompatible adaptations were necessary to libretroshare

RsGenExchange::deserializeGroupData
p3IdService::deserialiseIdentityFromMemory

Now accept an extra optional pointer parameter to return the id of the
  key so we can return it back from libresapi too and can be used to
  request more information about the key to the API.
2017-04-19 23:48:25 +02:00
Gioacchino Mazzurco
4455bfa92d Merge branch 'master' into merge_alpha_master 2017-04-18 21:30:25 +02:00
csoler
e2d9152b22 moved converted serialisation files into new directory rsitems/, leaving serialiser/ for the serialisation classes 2017-04-18 21:11:37 +02:00
Phenom
37331372c1 Fix Clang warnings: implicit conversion
warning: implicit conversion from 'int' to 'char' changes value from 255
to -1 [-Wconstant-conversion]
                                asctobin()[i] = 255;    /* used to
detect invalid characters */
2017-04-18 11:25:41 +02:00
Phenom
32eeb957b2 Fix Clang warnings: unused private field
warning: private field 'mAutoBanIdentitiesLimit' is not used [-Wunused-
private-field]
    float mAutoBanIdentitiesLimit ;
warning: private field 'mFiles' is not used [-Wunused-private-field]
    RsFiles* mFiles;
2017-04-17 21:35:29 +02:00
Phenom
4ac3b3f5bf Fix Clang warnings: implicit conversion of NULL to bool
warning: implicit conversion of NULL constant to 'bool' [-Wnull-
conversion]
        return NULL ;
        ~~~~~~ ^~~~
               false
2017-04-17 21:33:39 +02:00
Phenom
e83104ee0f Fix Clang warnings: Add author and date to #warning 2017-04-17 21:32:14 +02:00
Phenom
039908b2c6 Fix Clang warnings: private field not used
warning: private field 'mNetMgr' is not used [-Wunused-private-field]
    p3NetMgr *mNetMgr;
2017-04-17 21:29:16 +02:00
Phenom
872f42bcef Fix Clang warnings: Overloaded vf hide in pluginmanager
warning: 'RsPluginManager::loadConfiguration' hides overloaded virtual
function [-Woverloaded-virtual]
                virtual void loadConfiguration() ;
2017-04-17 21:28:24 +02:00
Phenom
22043094b5 Fix Clang warnings: extraneous parentheses
warning: equality comparison with extraneous parentheses [-Wparentheses-
equality]
                else if ((err == ECONNREFUSED))
                          ~~~~^~~~~~~~~~~~~~~
2017-04-17 21:26:50 +02:00
Phenom
dc533b1346 Fix Clang warnings: private field not used
warning: private field 'lastGroupId' is not used [-Wunused-private-
field]
    uint32_t lastGroupId;
warning: private field 'waittimes' is not used [-Wunused-private-field]
        int waittimes;
warning: private field 'listen_checktime' is not used [-Wunused-private-
field]
        long listen_checktime;
2017-04-17 21:26:09 +02:00
Phenom
65321501e4 Fix Clang warnings: Overloaded vf hide in p3dhtmgr
warning: 'p3DhtMgr::findPeer' hides overloaded virtual function [-
Woverloaded-virtual]
virtual bool    findPeer(std::string id);
warning: 'p3DhtMgr::dropPeer' hides overloaded virtual function [-
Woverloaded-virtual]
virtual bool    dropPeer(std::string id);
warning: 'p3DhtMgr::getPeerStatus' hides overloaded virtual function [-
Woverloaded-virtual]
virtual bool    getPeerStatus(std::string id,
2017-04-17 21:24:45 +02:00
Phenom
5bc6558567 Fix Clang warnings: explicitly assigning value to itself
/home/phenom/GIT/RetroShare/trunk/libretroshare/src/util/radix64.h:96:
warning: explicitly assigning value of variable of type 'int' to itself
[-Wself-assign]
                        idx = idx;
                        ~~~ ^ ~~~
2017-04-17 21:19:06 +02:00
Phenom
6fecac5f7b Fix Clang warnings: Overloaded vf hide
warning: 'pqiconnect::connect_parameter' hides overloaded virtual
function [-Woverloaded-virtual]
        virtual bool connect_parameter(uint32_t type, std::string value)
{ return ni->connect_parameter(type, value);}
                     ^
2017-04-17 21:15:52 +02:00
Phenom
cf963c0c73 Fix Clang warnings: struct declared as class
warning: 'RsMsgMetaData' defined as a struct here but previously
declared as a class [-Wmismatched-tags]
struct RsMsgMetaData
^
2017-04-17 21:15:15 +02:00
Phenom
105840ab98 Fix Clang Warning: Overloaded vf hide
warning: 'pqiConnectCbDummy::peerConnectRequest' hides overloaded
virtual function [-Woverloaded-virtual]
virtual void    peerConnectRequest(const RsPeerId& id,
                ^
2017-04-17 21:10:22 +02:00
csoler
f8fc8b40e4 removed old code in turtle serialiser 2017-04-16 20:16:59 +02:00
csoler
2ca46ec636 fixed bug in serialization of data chunks 2017-04-16 20:11:54 +02:00
csoler
121133488c fixed bug in serialization for turtle 2017-04-16 19:59:22 +02:00
csoler
636450f14d moved turtle and FT to new serialization 2017-04-15 18:46:44 +02:00
csoler
3453a3e57d switched FileTransfer items to new serialization 2017-04-11 23:05:27 +02:00
csoler
80e8769ed7 added missign file and converted BW control items 2017-04-11 21:37:35 +02:00
csoler
731e20d0a3 switch BanListItem classes to new serialization system 2017-04-10 22:09:56 +02:00
csoler
691ed8de08 added new template for std::string with type id 2017-04-10 20:34:02 +02:00
csoler
3130ec9041 added GUI async call to ID serialised data. Allows to copy+paste identities. 2017-04-10 20:02:14 +02:00
csoler
d66e653204 fixed bug in deserialisation of group informaiton 2017-04-08 23:39:05 +02:00
csoler
4f5da86aca added method to serialise/deserialise groups to/from memory and export of GxsIdentities to memory chunk in radix format 2017-04-08 19:07:33 +02:00
csoler
8b773885fd removed all chat serialization code 2017-04-05 21:02:17 +02:00
csoler
ae9d0b2ab4 fixed a few bugs in chat serialization 2017-04-05 20:49:32 +02:00
csoler
03c31ceacc fixed serialization test example 2017-04-05 18:27:29 +02:00
csoler
6b4fdb42ae fixed bug in serialization 2017-04-05 18:25:54 +02:00
csoler
a941136c04 fixed a few bugs in new serialization 2017-04-05 18:09:45 +02:00
csoler
5b3e488b42 fixed compilation 2017-04-05 16:53:20 +02:00
csoler
48688eae3f progress in converting chat items to new serialization 2017-04-05 10:27:12 +02:00
csoler
9438d60609 progress in converting Chat items to new serialization model 2017-04-04 22:53:50 +02:00
csoler
f2fa70e395 progress in converting Chat items to new serialization model 2017-04-04 16:37:57 +02:00
csoler
32ce9aea3a started converting rschatitems to new serialization 2017-04-04 15:33:59 +02:00