415 Commits

Author SHA1 Message Date
Ryan ZHAO
4628f27d9f fix error handling 2021-03-15 13:14:45 +11:00
jubb
323fb75149 fix: adding some message receive functionality 2021-03-12 17:15:33 +11:00
Ryan ZHAO
54da77a89b clean 2021-03-12 15:23:29 +11:00
Ryan ZHAO
d7e525d828 clean 2021-03-12 14:52:59 +11:00
Ryan ZHAO
91f9138d62 clean & refactor session protocol encryption 2021-03-12 13:37:16 +11:00
Ryan ZHAO
0e049469aa minor refactor on closed group encryption key pair sending 2021-03-12 10:21:09 +11:00
Ryan ZHAO
2859da01a7 fix duplicated closed group info message 2021-03-11 15:31:14 +11:00
Ryan ZHAO
d7124c3b7e minor refactor 2021-03-11 14:45:08 +11:00
Ryan ZHAO
42c7f440e9 fix quoting message in open groups 2021-03-11 14:37:53 +11:00
Ryan ZHAO
b490ed0c22 fix sending attachments(image) in open groups 2021-03-11 14:05:48 +11:00
Ryan ZHAO
a3e3f0047a fix closed group message sending & expiration mistakenly disabled 2021-03-11 10:23:16 +11:00
jubb
ca7202f255 feat: add new message receive pipeline in important places and fix parsing issues 2021-03-09 17:26:29 +11:00
Brice-W
c0e7f05d91 Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction 2021-03-09 16:29:41 +11:00
Brice-W
6bc832f50a DataExtractionNotification type created and added to proto 2021-03-09 16:27:12 +11:00
Ryan ZHAO
d85ad12352 fix sending link preview to open group 2021-03-09 16:15:39 +11:00
Ryan ZHAO
70a7182320 Merge branch 'dev' of https://github.com/oxen-io/session-android into refactor-sending 2021-03-09 14:46:14 +11:00
Ryan ZHAO
82b8883bb1 fix sending quote 2021-03-09 11:16:43 +11:00
Ryan ZHAO
0a7fecfb52 fix sending link preview 2021-03-09 10:50:02 +11:00
Ryan ZHAO
4218073a69 fix quote attachments 2021-03-05 13:31:40 +11:00
Ryan ZHAO
9d4c3bf722 send read receipt using new pipeline 2021-03-05 10:17:34 +11:00
Ryan ZHAO
d84b593da2 fix expiration timer animation 2021-03-05 09:53:58 +11:00
Ryan ZHAO
e0ff5a7e7a fix sending expiration update message 2021-03-04 17:14:12 +11:00
Ryan ZHAO
aa7071ad80 send typing indicator using new pipeline 2021-03-04 15:57:01 +11:00
Ryan ZHAO
a1d1b864e6 fix closed group updating 2021-03-04 15:16:47 +11:00
Ryan ZHAO
88ac390495 plug in closed group message sender 2021-03-04 14:54:32 +11:00
Ryan ZHAO
c51593a914 fix sending attachments including link previews 2021-03-04 14:03:18 +11:00
Ryan ZHAO
0fcef2d542 add padding for future & clean 2021-03-04 11:36:19 +11:00
Ryan ZHAO
152d403e2b fix send attachments to open groups 2021-03-03 15:58:36 +11:00
Ryan ZHAO
9a00906069 WIP debug sending attachments 2021-03-03 15:14:45 +11:00
jubb
ef3e172379 feat: add link device implementation and fixes for updating config syncs and forcing config syncs 2021-03-03 11:33:35 +11:00
Ryan ZHAO
0ea1ed15e7 WIP: make attachment work 2021-03-02 17:22:56 +11:00
Ryan ZHAO
4a9ac91e5f fix send text message to closed group 2021-03-02 14:30:16 +11:00
Ryan ZHAO
8acbb3c366 fix send text message to open group 2021-03-02 14:13:12 +11:00
Ryan ZHAO
d9eaedd6ae hook up sending pipeline & clean 2021-03-02 12:24:09 +11:00
jubb
3a09d23337 feat: add contact syncing, UI improvements for profile syncing and conversation threads in the home screen 2021-03-01 17:16:15 +11:00
jubb
85336238a7 fix: return early if no profile name (prefs likely invalid state) and ignore contacts whose publicKey fails to parse 2021-02-26 10:08:30 +11:00
Niels Andriesse
f2208f40b8
Merge pull request #462 from hjubb/config_contacts_sync_message
Config contacts sync message
2021-02-25 14:45:55 +11:00
jubb
21dc8d5fca fix: use double encoding for closed group stuff 2021-02-25 14:37:34 +11:00
jubb
9a33fe8883 feat: generate serializable Contact info for configuration messages and pass in appropriate list to get current 2021-02-25 12:13:31 +11:00
Ryan ZHAO
6c32815266 clean 2021-02-25 09:45:36 +11:00
Niels Andriesse
6f76f0046a
Merge pull request #458 from hjubb/config_profile_info
fix: orEmpty on profilePicture to prevent NPE for profile info
2021-02-24 16:41:46 +11:00
Ryan ZHAO
d5343d5462 Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0 2021-02-24 16:39:04 +11:00
jubb
ea857110bf fix: orEmpty on profilePicture to prevent NPE 2021-02-24 16:32:01 +11:00
jubb
71e48b9024 refactor: move ProfileKeyUtil from app/ to libsession/ module and implement new config message sends 2021-02-23 17:13:57 +11:00
Ryan ZHAO
ff36fbb6a1 further cleaning up on stickers 2021-02-23 15:07:31 +11:00
Ryan ZHAO
8c016b3802 clean up signal service protocols 2021-02-22 11:29:22 +11:00
Ryan ZHAO
19a829d011 WIP: clean up signal protocols (stickers) 2021-02-22 10:06:40 +11:00
Ryan ZHAO
04f140ee09 WIP: clean up signal service protos 2021-02-22 09:31:29 +11:00
Ryan ZHAO
b34809f4d5 WIP: clean up signal protocol 2021-02-19 16:06:10 +11:00
Ryan ZHAO
bbd067873a WIP: clean up signal protocol 2021-02-19 11:35:06 +11:00
Ryan ZHAO
1a907fcf54 WIP: clean up signal protocol 2021-02-18 17:05:34 +11:00
Ryan ZHAO
0d2f5e0cde further cleaning on V1 multi device 2021-02-18 15:12:30 +11:00
Ryan ZHAO
9d0831b874 remove shared sender keys 2021-02-18 14:14:05 +11:00
Ryan ZHAO
c69a8bc15f clean 2021-02-17 16:42:53 +11:00
Ryan ZHAO
64352707d0 clean up close group update message in new message pipeline 2021-02-17 16:31:43 +11:00
Ryan ZHAO
20ec889730 clean up V1 closed group 2021-02-17 16:09:36 +11:00
Ryan ZHAO
3285975b1a WIP: clean up V1 multi device 2021-02-17 10:51:02 +11:00
Ryan ZHAO
b517555a45 timestamp & duplicated message 2021-02-16 15:24:21 +11:00
Ryan ZHAO
e14b5b9f33 minor fix 2021-02-16 11:48:25 +11:00
Ryan ZHAO
c6084b0172 replace group create at timestamp with formation timestamp 2021-02-16 11:14:27 +11:00
Ryan ZHAO
f7463caf10 clean 2021-02-16 10:37:48 +11:00
Ryan ZHAO
6dfa882803 minor refactoring 2021-02-16 10:31:26 +11:00
Ryan ZHAO
f6455253a0 send latest encryption key pair 2021-02-16 10:28:24 +11:00
Ryan ZHAO
a7764ed5c9 Merge branch 'testing_multi_merge' of https://github.com/hjubb/session-android into multi_device_refactor 2021-02-16 09:26:55 +11:00
Ryan ZHAO
a5447e77e7 WIP closed group fix 2021-02-11 16:57:43 +11:00
Ryan ZHAO
5dadb89225 WIP: received message timestamps 2021-02-11 16:09:59 +11:00
Ryan ZHAO
5cbbf92fb9 sync target of multi device for refactored sending & receiving pipeline 2021-02-11 15:00:27 +11:00
jubb
5a892b2932 Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
#	libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java
2021-02-11 14:12:22 +11:00
jubb
fd0596f9ea fix: closed groups now propagate properly without self-sends 2021-02-10 17:57:08 +11:00
ryanzhao
4156c10feb Implement multi device & closed group protocol in refactored sending & receiving pipeline 2021-02-10 16:48:03 +11:00
ryanzhao
9cf292589b only handle the first configuration message 2021-02-10 09:37:20 +11:00
jubb
e62eb819c9 refactor: GroupUtil functions to be JvmStatic 2021-02-09 17:04:56 +11:00
Ryan ZHAO
6b45cc683e only handle the first configuration message 2021-02-09 17:00:17 +11:00
Ryan ZHAO
c2836cc654 add sync target to visible message 2021-02-09 16:49:22 +11:00
Ryan ZHAO
fb2757588d refactor: message sender + closed group 2021-02-09 14:45:22 +11:00
Ryan ZHAO
4cfa5e9f3b refactor: message sender + closed group 2021-02-09 13:55:01 +11:00
Ryan ZHAO
c32c58eee7 add open group through configuration message 2021-02-09 13:16:33 +11:00
Ryan ZHAO
5ceaf87ba9 implement closed group v2 handling and configuration message handling in refactored message receiving pipeline 2021-02-09 11:45:38 +11:00
jubb
57d532f4b8 feat: add self sending syncTarget messages 2021-02-08 16:57:12 +11:00
Ryan ZHAO
05da743ea2 configuration message handling 2021-02-08 16:44:26 +11:00
Ryan ZHAO
03ff1d1941 configuration message 2021-02-05 16:35:15 +11:00
jubb
ba5431b806 fix: compile errors from moving keypair out of ClosedGroupsProtocolV2 2021-02-05 10:27:24 +11:00
Ryan ZHAO
6c857e203b clean 2021-02-04 10:28:51 +11:00
ryanzhao
075e265a46 clean dynamic language 2021-02-03 14:04:27 +11:00
ryanzhao
93df9641c4 clean 2021-02-03 12:44:52 +11:00
ryanzhao
307da3b2be clean logging 2021-02-03 12:22:40 +11:00
Ryan ZHAO
0a952bcb85 sync dev 2021-02-02 17:05:21 +11:00
Ryan ZHAO
1e93d4651c clean 2021-02-02 15:40:43 +11:00
Ryan ZHAO
94913a334c clean 2021-02-02 15:10:23 +11:00
Ryan ZHAO
c8149209a1 clean & minor fix 2021-02-01 17:00:32 +11:00
Ryan ZHAO
2db567144d clean 2021-02-01 15:01:06 +11:00
Ryan ZHAO
c7af1cabe3 clean 2021-02-01 12:10:48 +11:00
Ryan ZHAO
5cb3a79a27 clean 2021-02-01 11:35:53 +11:00
Ryan ZHAO
9bc360f047 clean 2021-02-01 10:25:19 +11:00
Ryan ZHAO
190badd9c0 sync with dev 2021-02-01 09:39:14 +11:00
Ryan ZHAO
59ae46b300 recover pn 2021-01-29 17:03:58 +11:00
Ryan ZHAO
543019f93c clean 2021-01-29 16:35:47 +11:00
Brice
19d48f5b06 closed group control message updated 2021-01-29 13:35:51 +11:00
Brice
49f3e0cfca implementation of persistAttachments + refactoring 2021-01-29 11:16:53 +11:00
Ryan ZHAO
ebad701378 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-29 11:08:55 +11:00
Ryan ZHAO
3b50b8f40b fix closed groups & clean 2021-01-29 11:08:48 +11:00
Brice
5f0a5c5db6 Session jobs database implementation 2021-01-28 15:24:27 +11:00
Ryan ZHAO
13f94c2cfd sync dev 2021-01-27 15:54:12 +11:00
Ryan ZHAO
9eacdd7b3e sync update to libsession & clean 2021-01-27 10:54:25 +11:00
Ryan ZHAO
ef2380da76 make things work 2021-01-25 16:58:04 +11:00
Ryan ZHAO
8c22514b73 open group poller + loki user profile 2021-01-25 15:36:18 +11:00
Ryan ZHAO
e6fd57fa58 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-22 16:15:21 +11:00
Ryan ZHAO
2e3f50f8aa fix group encoded id 2021-01-22 16:15:13 +11:00
Brice
74e2fb6490 JobData class removed 2021-01-22 15:19:41 +11:00
Brice
787a635d0a Data & ParcelableUtil classes moved to libsession 2021-01-22 15:16:50 +11:00
Brice
7cc7cc60c7 serialization functions added to Job classes 2021-01-22 13:30:00 +11:00
Ryan ZHAO
d4781e64a3 clean group util 2021-01-22 10:33:19 +11:00
Ryan ZHAO
6fa2c308b5 WIP fix crashes 2021-01-21 17:04:56 +11:00
Ryan ZHAO
9856814904 WIP clean 2021-01-21 16:12:05 +11:00
Ryan ZHAO
17f401c356 make things compile 2021-01-21 15:42:43 +11:00
Ryan ZHAO
246eb62958 message sender failed with error 2021-01-20 16:37:02 +11:00
Ryan ZHAO
f3c3483cde complete message sender 2021-01-20 16:29:52 +11:00
Ryan ZHAO
a9df948375 message sender prep for attachments 2021-01-20 11:18:22 +11:00
Ryan ZHAO
70456d0fd9 closed group encryption key pair 2021-01-20 11:18:00 +11:00
Ryan ZHAO
9df6bb11d1 WIP complete storage protocol 2021-01-20 10:04:14 +11:00
Ryan ZHAO
39858cb0c8 persist message 2021-01-19 17:06:02 +11:00
Brice
845ea16415 impl of missing methods in DatabaseAttachmentProvider 2021-01-19 11:39:45 +11:00
Ryan ZHAO
883c71331b WIP clean & make things compile 2021-01-19 10:48:02 +11:00
Ryan ZHAO
31d4deb354 WIP clean & make things compile 2021-01-19 09:12:44 +11:00
Ryan ZHAO
f7d898d5e3 WIP make things compile 2021-01-18 15:37:23 +11:00
Ryan ZHAO
2d239541b9 WIP make things compile 2021-01-18 14:58:11 +11:00
Brice
4fc0c3dddc quick code refactoring 2021-01-15 17:08:08 +11:00
Ryan ZHAO
7cdffc1801 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-15 16:52:09 +11:00
Ryan ZHAO
1f96ab1cf5 WIP clean 2021-01-15 16:51:53 +11:00
Brice
b11ef9da04 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-15 16:19:29 +11:00
Brice
3e04ebc286 ClosedGroupUpdateV2 class added 2021-01-15 16:18:55 +11:00
Ryan ZHAO
6cd00aec77 WIP clean 2021-01-15 15:36:30 +11:00
Ryan ZHAO
a5e37fd171 WIP make things compile 2021-01-14 16:33:03 +11:00
Ryan ZHAO
fcb71961d6 WIP make things compile 2021-01-14 13:54:21 +11:00
Ryan ZHAO
8e8abcbe81 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-14 13:28:25 +11:00
Ryan ZHAO
58ad4aef33 make thing compile 2021-01-14 13:26:53 +11:00
Brice
3357672516 MessaageSender: use of session protocol for closed groups 2021-01-14 13:20:18 +11:00
Brice
6f22c3d6e3 MessageReceiver synced with iOS 2021-01-14 11:42:26 +11:00
Ryan ZHAO
7ca8456383 WIP clean 2021-01-14 10:28:07 +11:00
Ryan ZHAO
709727197c Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-13 17:15:17 +11:00
Ryan ZHAO
74a9754f48 implement interfaces 2021-01-13 17:11:30 +11:00
Ryan ZHAO
cb5ee74a43 WIP notification 2021-01-12 09:58:58 +11:00
Ryan ZHAO
d5c84b3c60 message receiving handling 2021-01-12 09:58:38 +11:00
Brice
f420ec51e2 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-11 11:06:01 +11:00
Brice
48201a90ea encrypt & decrypt with session protocol 2021-01-11 11:04:37 +11:00
Ryan ZHAO
4b53138373 moving attachment to libsession 2021-01-08 17:05:44 +11:00
Ryan ZHAO
0820e577e8 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2021-01-08 11:13:12 +11:00
Ryan ZHAO
bace36621d WIP finish message receiving 2021-01-08 11:13:05 +11:00
Ryan ZHAO
e45462588f update gradle 2021-01-08 11:12:39 +11:00
Ryan ZHAO
172991231c group address 2021-01-08 11:12:24 +11:00
Ryan ZHAO
27ea170194 move quote model to libsession 2021-01-08 11:12:06 +11:00
Ryan ZHAO
31efdb7ddb add recipient related stuff to storage 2021-01-08 11:11:50 +11:00
Ryan ZHAO
ed8eb5a239 fix open group message 2021-01-08 11:11:23 +11:00
Ryan ZHAO
91ef23081b move Recipient to libsession 2021-01-08 11:10:51 +11:00
Brice
842f00ee54 downloadattachmentjob implementation 2021-01-06 16:11:00 +11:00
Brice
3a9304098b fix conflict 2021-01-05 14:17:42 +11:00
Ryan ZHAO
2dcbcee66c minor fix after merging 2020-12-18 16:59:37 +11:00
Ryan ZHAO
80fa37e1a7 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2020-12-18 16:53:05 +11:00
Ryan ZHAO
c9673447c6 handle visible message & handle group update 2020-12-18 16:48:45 +11:00
Ryan ZHAO
886ca5c72b minor refactoring on message sender 2020-12-18 16:44:33 +11:00
Ryan ZHAO
1c4e4581c8 attachment in message provider 2020-12-18 16:44:13 +11:00
Ryan ZHAO
b642fb1b54 update message receiving job 2020-12-18 16:43:57 +11:00
Ryan ZHAO
2a4046d12c open group message & open group poller 2020-12-18 16:43:19 +11:00
Brice
873e0099f9 fix 2020-12-17 16:52:22 +11:00
Brice
9304971e50 AttachmentUploadJob implementation 2020-12-17 14:51:08 +11:00
Brice
0467147cfe use of SessionServiceAttachment instead if SignalSA 2020-12-17 14:45:57 +11:00
Brice
c286efae9d SignalServiceAttachment classes renamed to SessionServiceAttachment to avoid confusion 2020-12-17 14:36:32 +11:00
Brice
26b2ead673 kotlin impl of SignalServiceAttachment classes 2020-12-17 14:27:04 +11:00
Brice
3a10d8c1b4 MessageReceive & Send Jobs implementations 2020-12-15 15:50:15 +11:00
Brice
e9c5eb5257 super class updated 2020-12-15 15:47:47 +11:00
Brice
625e9f172a attachmentId type changed to Long 2020-12-15 15:45:44 +11:00
Ryan ZHAO
2ff23e9e41 clean 2020-12-10 15:51:43 +11:00
Ryan ZHAO
133706e1d6 WIP pollers 2020-12-10 15:34:17 +11:00
Ryan ZHAO
c0dff9cdea sending & receiving $ make things compile 2020-12-10 15:33:57 +11:00
Ryan ZHAO
072aa0e7c6 implement destination from address 2020-12-10 15:33:05 +11:00
Ryan ZHAO
92b43b0fcf clean and rename 2020-12-10 15:32:38 +11:00
Ryan ZHAO
4c1df33059 job related 2020-12-10 15:31:38 +11:00
Ryan ZHAO
c3552bfded clean 2020-12-10 15:31:14 +11:00
Ryan ZHAO
ce4f7a6eff rename configuration 2020-12-10 15:30:32 +11:00
Ryan ZHAO
c759f25577 add thread related classes 2020-12-10 15:29:56 +11:00
Ryan ZHAO
fea965e37f add utils 2020-12-10 15:29:19 +11:00
Ryan ZHAO
e54a43a910 move messageDataProvider to configuration 2020-12-07 15:32:48 +11:00
Ryan ZHAO
2cdbbd1d23 clean 2020-12-07 15:27:39 +11:00
Ryan ZHAO
e2e78ce5fb Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2020-12-07 15:26:52 +11:00
Ryan ZHAO
b5fe9f43cb message sender closed group + convenience 2020-12-07 15:22:02 +11:00
Brice
f642e76ca4 messages: completed missing parts related to database calls 2020-12-07 14:30:06 +11:00
Brice
e0d98641aa removal of 'transaction' parameter in toProto + code simplification 2020-12-03 16:13:40 +11:00
Brice
2b1655d688 test commit 2020-12-03 15:12:50 +11:00
Brice
a53cc9bffb Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2020-12-03 14:36:07 +11:00
Brice
3d87de4b56 SessionRequest implementation completed 2020-12-03 14:29:50 +11:00
Ryan ZHAO
5924d90b12 refactor unidentified access (sealed sender) 2020-12-03 14:20:49 +11:00
Ryan ZHAO
c758619f13 clean 2020-12-02 17:10:45 +11:00
Ryan ZHAO
1407d1ca97 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2020-12-02 17:06:34 +11:00
Ryan ZHAO
295eb3b52f rename and minor refactor to match the api 2020-12-02 17:06:28 +11:00
Brice
69ba55138f test commit 2020-12-02 16:46:48 +11:00
Ryan ZHAO
bd96342a16 minor refactoring on receiving decryption 2020-12-02 16:43:19 +11:00
Ryan ZHAO
55b68c3db9 Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor 2020-12-02 16:40:35 +11:00
Ryan ZHAO
0a43704269 message sending and receiving 2020-12-02 16:39:33 +11:00
Ryan ZHAO
6cc20b81bd decryption and encrytion 2020-12-02 16:39:21 +11:00
Ryan ZHAO
bfb16c581a WIP: refactor jobs (basic) 2020-12-02 16:39:02 +11:00
Ryan ZHAO
da71fdfe44 add configuration and storage 2020-12-02 16:38:30 +11:00
Ryan ZHAO
c1f84732ad move and refactor files from libsignal to libsession 2020-12-02 16:38:12 +11:00
Ryan ZHAO
5789c146de add dependencies 2020-12-02 16:36:40 +11:00
Brice
a699168956 code review, minor changes 2020-12-02 16:21:38 +11:00
Brice
aefe721fa4 Attachment implementation 2020-12-02 15:02:46 +11:00
Brice
344af77f0f incomplete Quote implementation 2020-12-02 11:44:55 +11:00
Brice
feec22bf72 Profile implementation 2020-12-01 17:35:47 +11:00
Brice
f5a583e7c8 classes structure redesign + LinkPreview & BaseVisibleMessage implementations 2020-12-01 16:24:50 +11:00
Brice
3f0e456002 SessionRequest unfinished implementation 2020-11-30 11:23:27 +11:00
Brice
2c167b0cc0 NullMessage implementation 2020-11-30 10:29:06 +11:00
Brice
3a0ba29a72 TypingIndicator implementation 2020-11-30 10:08:56 +11:00
Brice
746df2240a ReadReceipt implementation + small corrections 2020-11-27 17:27:09 +11:00
Brice
8f409faefc ExpirationTimerUpdate implementation + classes structure changes 2020-11-27 16:41:21 +11:00
Brice
888eda4ba9 change package name + start of implementation 2020-11-27 15:56:16 +11:00
Ryan ZHAO
7a66a47520 restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00