Morgan Pretty
4801ebd7c2
Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
...
# Conflicts:
# SessionMessagingKit/Configuration.swift
# SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
# SessionMessagingKit/Jobs/Types/AttachmentUploadJob.swift
# SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
# SessionMessagingKit/Jobs/Types/MessageSendJob.swift
# SessionMessagingKit/Jobs/Types/NotifyPushServerJob.swift
# SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
# SessionUtilitiesKit/JobRunner/JobRunner.swift
2023-04-05 16:52:31 +10:00
Morgan Pretty
ffdc59b704
Fixed a few issues with the JobRunner
...
Updated the JobRunner to support dependency injection
Updated the DataExtractionNotification to take a 'sentTimestamp' when created to reduce the chance for duplicates being sent
Fixed an issue where checking current and pending jobs wasn't including blocking jobs
Fixed an issue where the 'hasPendingOrRunningJob' check didn't actually include running jobs
Fixed some odd behaviours with job dependencies
Fixed an incorrect failure count check
2023-04-05 16:49:38 +10:00
ryanzhao
c101f61473
clean
2023-04-04 13:53:39 +08:00
ryanzhao
d2dbace848
clean
2023-04-04 12:00:02 +08:00
ryanzhao
84dd7f1a7f
Merge branch 'dev' into conversation-swipe-actions
2023-04-04 11:38:37 +08:00
ryanzhao
36748a81c6
use delete action for group that current user is no longer in
2023-04-04 11:38:04 +08:00
Morgan Pretty
3c526645a0
Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
2023-04-04 12:11:07 +10:00
Morgan Pretty
dcae781923
Fixed a crash due to database reentrancy when generating the users blinded public key
2023-04-04 10:18:43 +10:00
ryanzhao
7f24097343
update leave group copy in conversation settings view
2023-04-03 15:41:17 +08:00
Morgan Pretty
a7af1ca768
Started laying the ground work for unit testing the JobRunnner
...
Starting injecting dependencies for the JobRunner
Turned the JobRunner into a singleton instance
2023-04-03 17:35:46 +10:00
ryanzhao
6302170e4d
remove mark as read/unread action
2023-04-03 15:26:40 +08:00
ryanzhao
27cfe6b8b8
make the swipe actions always right & correct the copy for delete a covnersation
2023-04-03 15:22:36 +08:00
ryanzhao
620d69ada9
Merge branch 'dev' into conversation-swipe-actions
2023-03-17 14:48:52 +11:00
Morgan Pretty
e1c83dc999
Merge remote-tracking branch 'upstream/dev' into fix/appium-interaction-issues
...
# Conflicts:
# Session/Conversations/Message Cells/VisibleMessageCell.swift
2023-03-16 16:10:53 +11:00
ryanzhao
cea2e1522d
WIP: make group leaving a job
2023-03-14 17:08:38 +11:00
ryanzhao
51d8eea68c
clean
2023-03-10 15:50:17 +11:00
ryanzhao
079d6f8c9f
disable the swipe actions when in the "leaving" state
2023-03-10 14:04:29 +11:00
ryanzhao
bf08394ebd
change the title back to text primary colour when failed to leave a group
2023-03-10 13:25:42 +11:00
ryanzhao
282230c87a
minor refactor
2023-03-08 17:10:21 +11:00
ryanzhao
102b4a67ad
update UI and copy for group leaving status
2023-03-08 17:00:17 +11:00
ryanzhao
f14982ed7b
minor fix
2023-03-08 14:17:19 +11:00
ryanzhao
e37756ccf4
add leaving status for leaving groups
2023-03-08 14:10:41 +11:00
ryanzhao
34d41d7d40
Merge branch 'dev' into conversation-swipe-actions
2023-03-08 11:55:53 +11:00
ryanzhao
975812db95
WIP: update info message for user leaving a group
2023-03-08 11:13:37 +11:00
ryanzhao
ee8008ff4d
minor optimisation on fetching attachment from database
2023-03-07 16:02:46 +11:00
ryanzhao
d0ba22dc4f
fix retry sending attachments that are not downloaded
2023-03-07 15:48:27 +11:00
ryanzhao
36e753366d
WIP: add leaving status for leaving groups
2023-03-07 15:07:24 +11:00
ryanzhao
f3c79007d8
replace icon image with system SF Font
2023-03-07 13:54:21 +11:00
Ryan Zhao
1b744e9bc2
Merge branch 'dev' into conversation-swap-action
2023-03-06 16:13:27 +11:00
Ryan Zhao
00d5d08152
fix retry action will end up with sending the same interaction twice
2023-03-06 15:31:04 +11:00
Ryan Zhao
3aacf27b79
regenerate the quoted attachment thumbnail when retrying to send the message
2023-03-06 14:33:24 +11:00
ryanzhao
84ea821095
WIP: fix quote when retrying sending a message
2023-03-02 17:05:26 +11:00
ryanzhao
f8dc2ddfb8
fix incorrect closed group leaving warning for members and admins
2023-02-28 14:25:15 +11:00
Ryan Zhao
a0ba1484f5
fix an edge case of showing 'original message not found' incorrectly
2023-02-27 17:16:38 +11:00
Ryan Zhao
cd3c1ee043
fix attachment description
2023-02-27 16:54:54 +11:00
Ryan Zhao
900a97bd8c
fix incorrect icon colour in draft quote
2023-02-27 16:46:47 +11:00
Ryan Zhao
612be697ef
feat: swap action leave/delete, pin, mute/unmute, mark read/unread
2023-02-27 15:42:48 +11:00
Ryan Zhao
2aee7b8c05
Merge branch 'dev' into conversation-swap-action
2023-02-27 11:40:49 +11:00
Ryan Zhao
9112231f66
WIP
2023-02-27 11:37:25 +11:00
RyanZhao
1791d7ebf2
Merge branch 'dev' into accessibility_ids_3
2023-02-27 11:32:11 +11:00
ryanzhao
b3378992ed
WIP: feat: modify conversation swap actions
2023-02-24 17:03:45 +11:00
Morgan Pretty
6851bb25fc
Fixed a wrong variable name
2023-02-24 11:19:28 +11:00
Morgan Pretty
bead5ca1e6
Fixed a couple of action sheets which could crash on iPad
2023-02-24 11:12:41 +11:00
Morgan Pretty
84daff6e3d
Fixed an incorrect push registration
2023-02-21 16:05:46 +11:00
Ryan Zhao
aca587be17
Merge branch 'dev' into fix-quoting-in-community-chats
2023-02-20 10:02:08 +11:00
Morgan Pretty
afc698e370
Merge pull request #790 from mpretty-cyro/fix/voice-recording-breaking-input
...
Fixed an issue where the voice recording could break the input view
2023-02-20 08:45:39 +11:00
Morgan Pretty
e4d6400375
Merge remote-tracking branch 'upstream/dev' into fix/remaining-reachability-oddities
...
# Conflicts:
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/es.lproj/Localizable.strings
# Session/Meta/Translations/fa.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hi.lproj/Localizable.strings
# Session/Meta/Translations/hr.lproj/Localizable.strings
# Session/Meta/Translations/id-ID.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.lproj/Localizable.strings
# Session/Meta/Translations/nl.lproj/Localizable.strings
# Session/Meta/Translations/pl.lproj/Localizable.strings
# Session/Meta/Translations/pt_BR.lproj/Localizable.strings
# Session/Meta/Translations/ru.lproj/Localizable.strings
# Session/Meta/Translations/si.lproj/Localizable.strings
# Session/Meta/Translations/sk.lproj/Localizable.strings
# Session/Meta/Translations/sv.lproj/Localizable.strings
# Session/Meta/Translations/th.lproj/Localizable.strings
# Session/Meta/Translations/vi-VN.lproj/Localizable.strings
# Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
# Session/Meta/Translations/zh_CN.lproj/Localizable.strings
2023-02-20 08:44:56 +11:00
Morgan Pretty
08b1e9a131
Started caching pending ReadReceipt messages to resolve an edge-case
...
Fixed an issue where read receipts could be sent for already read messages
Fixed an issue where the read state change might not update the UI
2023-02-15 15:11:57 +11:00
Morgan Pretty
275314c9fd
Fixed an issue where the voice recording could break the input view
2023-02-15 11:53:57 +11:00
Morgan Pretty
2bcc049405
Fixed an issue where Appium couldn't long press message bubbles
2023-02-14 17:04:30 +11:00
