Commit Graph

245 Commits

Author SHA1 Message Date
ThomasSession
a84ba25a79 Migrating to Material3 2024-07-15 17:35:41 +10:00
ThomasSession
e45ee133bf Merge branch 'dev' into feature/compose-cleanup 2024-07-11 16:12:02 +10:00
AL-Session
2e3acd902f
SS-2168 - User profile warnings (#1531)
* Profile picture upload fail informs user

* End of day push

* Push before trying with okhttp library update

* WIP

* Further WIP

* Add additional debug comments

* Push before cleanup

* Cleaned up

* More cleanup

* Minor adjustment

* Final cleanup prior to PR review

* Removed commented out old conscrypt version import

* Addressed PR feeback from Fanchao

---------

Co-authored-by: alansley <aclansley@gmail.com>
2024-07-09 16:23:26 +10:00
ThomasSession
2b27b7d5e0 Bumping the version code and name 2024-07-09 09:33:06 +10:00
bemusementpark
7111bb7725 Merge branch 'od' into on-2 2024-07-03 12:12:51 +09:30
Fanchao Liu
fec67e282a
[SES-2018] Refactor mention (#1510)
* Refactor mention

* Fixes robolectric test problem

* Fixes tests

* Naming and comments

* Naming

* Dispatcher

---------

Co-authored-by: fanchao <git@fanchao.dev>
2024-07-01 17:31:03 +10:00
Andrew
9ee2b9207b Remove deprecated accompanist-pager 2024-06-11 09:58:18 +09:30
Andrew
50addd644c Merge branch 'on' into on-2 2024-06-06 09:21:49 +09:30
Andrew
59910eeb48 Merge branch 'dev' into on 2024-05-30 11:09:51 +09:30
Andrew
9b6fa0db01
Update version for release-1.18.4 2024-05-30 09:38:33 +09:30
Andrew
9d22e86a2f Merge master into dev 2024-05-24 12:03:52 +09:30
Andrew
cf13caaee4
Bump canonicalVersionCode 2024-05-17 16:25:19 +09:30
Andrew
44f47662a7
Update version 1.18.3 2024-05-17 14:07:33 +09:30
Andrew
8ef8107101 Merge branch 'dev' into on 2024-05-15 11:15:11 +09:30
Andrew
cad96001d1 Merge branch 'dev' into on-2 2024-05-08 15:59:53 +09:30
AL-Session
fbc82d7831
SES1628 - Add git commit details to version info (#1459)
* Fixes #1458

* Addressed PR feedback
2024-05-02 12:55:24 +10:00
AL-Session
d8daf6175e
Fixes #1476 - Canononical version number needs to be bumped to provide new Google Play Store release
Co-authored-by: alansley <aclansley@gmail.com>
2024-05-01 20:08:36 +10:00
Andrew
d16faf94c9
Merge dev (#1468)
* Remove unused sizeResId

* Fix caching

* Prefix message with name in HomeActivity

* Hide sender prefix for note to self

* Hide sender prefix for control messages

* Remove problematic getLastMessage()

* Refactor snippet formatting

* Remove unused RecoveryPhraseRestoreActivity

* Fix unresolved theme attributes exception

* Fix dialog button style

* Investigation in progress

* Working fix push before cleanup

* Fixes #1346

* Removed unused logging imports

* Put back some whitespace

* Minor cleanup

* Fix NPE on null display name

* fix: disappearing viewmodel tests (#1432)

* SES-1354 - Video call self viewer not mirrored (#1397)

* Fixes #874

* Removed accidentally left in line

* Fixed issue - push before cleanup

* Cleaned up

* Removed cruft

---------

Co-authored-by: = <=>
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>

* SES-1145 - New messages are hidden under keyboard - MK3 (#1415)

* WIP

* Working - push before cleanup

* Fixes #1316

* Cleanup

* PR review adjustments

* Fixed scrolling when receiving an image based message while keyboard is up

* Prevent auto-scroll to last seen item pos in conversation view if <= 3

* Put back <=3 check to scroll

---------

Co-authored-by: = <=>
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>

* Fix missing parenthesis

* SES-789 - Scroll to bottom of long new message(s) (#1426)

* WIP

* Working - push before cleanup

* Fixes #1316

* Cleanup

* PR review adjustments

* Fixed scrolling when receiving an image based message while keyboard is up

* Prevent auto-scroll to last seen item pos in conversation view if <= 3

* Put back <=3 check to scroll

* Forced scrolling to bottom of long messages (both sent and received) when already at the bottom of the RecyclerView

* Fixes #1364

---------

Co-authored-by: = <=>
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>

* SES-1352 - User and group names allowing multi-line strings (#1395)

* Fix WIP

* Resolved issue - pushing before cleanup & PR tomorrow morning

* Enforced single line for new closed group names

* Fixes #1394

* Final cleanup prior to PR

* Added code to restore a previous contact nickname if an empty one is given

* Added initial limits to nicknames and group names, both creation and display

* Minor adjustments

* Adjusted max nickname and group name to 35 chars as per Kee's instructions

* Fixed closed group edit text able to get too wide and cut off buttons

---------

Co-authored-by: = <=>
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
Co-authored-by: Al Lansley <al@oxen.io>

* SES-212 - Always show delivery status of last sent message - FINAL! (#1418)

* Fixes #1408

* Addressed PR feedback

* Cleanup

* PR adjustments

* Further PR adjustments

* Updated libsession-util

* Added fix for crash when no messages

* Ignoring dirty submodules so they don't show up in git

* Re-fixed display of delivery status on last sent message (got broken by disappearing messages)

* Removed ignore dirty modules line in .gitmodules as it all seems to be playing nice now

---------

Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
Co-authored-by: Al Lansley <al@oxen.io>

* fix: use a set for the from/to serialized lists (#1370)

* Fixes #1347 (#1396)

Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
Co-authored-by: Al Lansley <al@oxen.io>

* SES-1156 - Ban and delete functionality fix (#1428)

* WIP

* Investigation in progress

* End of day push

* WIP

* Fixes #1416

* Cleanup

* Added code to remove zombie messages caught in limbo during a ban & delete - still chock full o' debug while finding root cause

* Root cause debug WIP

* Push prior to cleanup

* Cleaned up for PR

* fix: mms delete, remove unnecessary values from sms

* Addressed PR feedback

* fix: fix unit tests

* Added '.run' folder with test setup

* Update README.md

Test commit for CI

* Re-added accidentally removed closing brace

---------

Co-authored-by: alansley <aclansley@gmail.com>
Co-authored-by: Al Lansley <alansley@users.noreply.github.com>
Co-authored-by: 0x330a <92654767+0x330a@users.noreply.github.com>

* SES-1356 - List of recently used reaction emojis is not accurate (#1400)

* WIP

* Further WIP

* Push prior to cleanup

* Fixes #1015

* Added limiting to the count of recently used emoji that we store

* Put back adjusted reaction pill layout to standard

* Adjusted recently used reaction emojis already in list to go to start of list

---------

Co-authored-by: = <=>

* SES-697 - Add loading state when exporting logs (#1402)

* WIP

* Fixes #1401

* Cleanup from PR view

* Final cleanup

* Removed commented line of code & re-ordered comment

* Addressed PR feedback

* Re-allowed loading of avatars to throw exceptions rather than return null on failure

---------

Co-authored-by: = <=>

* SES-1251 - App crash on non alphanumeric first char search (#1393)

* Investigation in progress

* Working fix push before cleanup

* Fixes #1346

* Removed unused logging imports

* Put back some whitespace

* Minor cleanup

* Push before cleanup

* Fixes #1346 - properly this time!

* SES1567 - Community message delivery status fix (#1442)

* Initial investigation

* WIP

* Continued work to track down cause of delivery status issue

* Fixes #1438

* Cleanup for PR

* Further cleanup

* Fixed merge conflict

* Addressed PR feedback

---------

Co-authored-by: alansley <aclansley@gmail.com>

* Tiny adjustment to center user name in Settings activity (#1446)

* Addressed PR feedback

* Cleanup

* Initial fix implemented

* Fixes #1448

* Addressed PR feedback

* SES1688 - Deleting last message in conversation, group, or community leaves the RecyclerView in a broken state (#1449)

* Initial fix implemented

* Fixes #1448

* Addressed PR feedback

* Handle case where there are no messages

* build: update build number

* Fix spacing when title is absent

* Hide reply button in MessageDetails for group invitations

* Remove reply from context menu for open group invitations

* Ignore swipe reply to open group invitation

* Fix multiple quote previews

* Fix message menu icons not visible in light theme

* Hide reply app bar menu item for open group invite

* SES-1727 Mentions text is the wrong colour (#1454)

* Fixes #1453

* Cleanup

* Code review adjustments

* Adjusted mentions to use the accent colour as their background colour when using light themes

---------

Co-authored-by: alansley <aclansley@gmail.com>

* Disable swipe to reply on open group invites

* Fix multiple link previews

* SES1718 - Message Sending Status (#1462)

* Investigation in progress

* Initial push for PR

* Fixes #1461

* Removed leftover debug comments

* Added minor optimisation to showMessageStatus method (bail early if the message isn't one we care about displaying details of to the user)

* Minor cleanup

* Tiny cleanup

* Addressed PR feedback

* Removed forgotten debug log line & forced delivery status elements to be removed on non-visible messages just in case

* Minor refactor to simplify 'VisibleMessageView.showStatusMessage'

---------

Co-authored-by: alansley <aclansley@gmail.com>

* Fix margins

* WIP

* Commit before converting SmsDatabase from Java to Kotlin

* Remove old expiration config strings from UpdateMessageBuilder

* Fix group expiration update config messages

* Fixed conversation view closing + hopefully wrong status text displayed + deletion of contact on removal of last message in 1-on-1 convo

* Cleanup for PR review

* Implemented PR feedback

* Don't start expiration for group expiration update messages

* Fix expiry update message for groups

* Correctly don't start disappear timer on group timer updates

* SES1813 - Fix regression test failures (#1473)

* Initial fix for regression test failure 1.1

* Added permissions fix for sharing documents which should allow for thumbnail generation

* Minor touch-up prior to merge into dev

* Fixes #1813

* Fixes #1472 - please ignore previous fixes 1813 statement, I'd used the Jira ticket number rather than creating a GitHub issue and using that

---------

Co-authored-by: alansley <aclansley@gmail.com>

---------

Co-authored-by: alansley <aclansley@gmail.com>
Co-authored-by: 0x330a <92654767+0x330a@users.noreply.github.com>
Co-authored-by: Al Lansley <alansley@users.noreply.github.com>
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
Co-authored-by: Al Lansley <al@oxen.io>
2024-05-01 12:59:33 +10:00
Andrew
89d93bc80d Merge branch 'dev' into on-2 2024-04-24 17:43:04 +09:30
Andrew
c589bed249 Update settings 2024-04-11 14:20:32 +09:30
0x330a
1d9ac6ac10
build: update build number 2024-04-10 15:31:33 +10:00
Andrew
eb958bac4e Merge branch 'on' into on-2 2024-04-09 10:29:05 +09:30
Andrew
2cc83cd650 Updates for code review 2024-04-04 22:14:55 +10:30
Andrew
f89e4705d5 Update New Message Screen 2024-04-03 09:48:15 +10:30
Andrew
92c2d574ae Fix HomeActivityTests 2024-03-20 13:01:44 +10:30
Andrew
d083b19a12 Merge branch 'dev' into on 2024-03-16 14:27:18 +10:30
Andrew
4279c4b456 Merge branch 'dev' into on 2024-03-15 10:24:52 +10:30
0x330a
7bcf823740
build: update build number 2024-03-04 17:28:21 +11:00
Andrew
437d0de5e1 Add camera to QR tab 2024-03-01 11:47:54 +10:30
Andrew
79cfde1924 Add QR camera permissions 2024-02-29 19:33:45 +10:30
Andrew
ab62d8f333 Add Recovery Phrase tab 2024-02-29 14:56:30 +10:30
Andrew
7a1b5749aa Fade in Copied on copy password 2024-02-28 22:25:51 +10:30
0x330a
f88eab7323
build: update build number 2024-02-28 18:26:28 +11:00
0x330a
a4c99799a2
build: update build version 2024-02-28 17:33:56 +11:00
Andrew
0ca55c8f42 Merge branch 'dev' into on 2024-02-09 13:41:36 +10:30
Andrew
e4999e3b84 Merge branch 'dev' into disappear-2 2024-02-09 13:12:31 +10:30
Morgan Pretty
bd03bf45c2 Initial CI setup test
Added code coverage report generation (for future CI stuff)
Fixed a flaky unit test
2024-02-07 13:19:57 +11:00
andrew
a57b7ef121 build: update version code 2023-12-11 15:22:13 +10:30
andrew
4dd451e77f Merge branch 'dev' into on 2023-10-18 12:59:10 +10:30
andrew
c2088efe43 Merge branch 'dev' into on 2023-10-16 10:11:39 +10:30
0x330a
f6a736bd13
Merge remote-tracking branch 'origin/master' into disappear-2 2023-10-16 09:57:49 +11:00
0x330a
9d02eb33c7 build: update version code 2023-10-13 16:48:47 +11:00
andrew
793fe63260 Merge branch 'dev' into disappear-2 2023-10-13 15:51:43 +10:30
0x330a
82cbf830ae
fix: need quotes on job type key 2023-10-11 17:52:04 +11:00
0x330a
c1102a2a50
build: update build number 2023-10-11 17:37:55 +11:00
andrew
b7ffc9afc9 Merge branch 'dev' into on 2023-10-11 11:17:49 +10:30
andrew
f71c56022d Merge branch 'dev' into disappear-2 2023-10-11 09:48:36 +10:30
0x330a
cb1b5b0f78
build: update version name and code 2023-10-09 10:12:51 +11:00
andrew
892e4b75ec Merge branch 'dev' into disappear-2 2023-10-06 12:01:23 +10:30
0x330a
84bc1dcb6b
Update session libsodium (#1326)
* chore: update dependencies for the libsodium dependency and replace aar

* fix: update gradle dependencies to work with integration tests

* fix: test

* refactor: make it use espresso wait

* refactor: bring compose dependencies back to stable releases
2023-10-04 15:17:27 +11:00