Commit Graph

9469 Commits

Author SHA1 Message Date
SessionHero01
7c1efeaaaa
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
#	app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
2024-10-23 15:16:43 +11:00
SessionHero01
c6aefc5fb1
Fixed merge conflicts 2024-10-23 15:15:49 +11:00
ThomasSession
16cca2d3cc
Getting the recipient from the VM (#1694) 2024-10-23 13:48:52 +11:00
Andrew
3e17ab2b06
Optimise and test IP2Country (#1684)
* Move ipv4Int to top level

* Remove redundant fun calls in ipv4ToCountry

* Add null safety to loadFile

* Close streams on failure

* Simplify cacheCountryForIP

* Add IP2CountryTest

* Generate binary

* Simplify ipv4Int

* Fix companion object visibility

* Use array instead of Treemap

* Synchronize OnionApi#paths

* Move csv

* Deduplicate locations csv

* Move ipToCode to gradle

* Use std lib binarySearch

---------

Co-authored-by: bemusementpark <bemusementpark>
2024-10-23 13:48:29 +11:00
SessionHero01
0bc933dcec
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsViewModel.kt
#	app/src/main/res/layout/activity_conversation_v2.xml
#	app/src/test/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModelTest.kt
2024-10-22 15:57:22 +11:00
SessionHero01
01ef596d44
Remove unused files 2024-10-22 15:50:13 +11:00
ThomasSession
4917548faf
Fix/empty conversations (#1698)
* Not deleting a thread when it's empty - showing an empty snippet when thread is empty or only made up of 'marked as deleted' messages

* SES-2814 - show empty state when conversations are empty
2024-10-22 15:38:46 +11:00
ThomasSession
4b01fcec5e
Fix/message deletion issues (#1697)
* SES-2810 - Removing the screenshot privacy toggle

* SES-2813 - clickable only when there is a 'follow settings'

* SES-2815 - proper icon and spacing for deleted messages

* Simplified deletion dialog to be reused for note to self and the rest as only the labels change

* SES-2819 - Do not show a reaction on a deleted message

* Fixing up deletion details

Message view hides reactions completely if the message is marked as deleted
All  messages can now show the 'Delete' long press option
Community messages should be removed completely not marked as deleted

* Revert "SES-2819 - Do not show a reaction on a deleted message"

This reverts commit 711e31a43a.

* Avoiding adding reactions if the message is marked as deleted

* Removing uneeded icon

* Deletion handled by VM so menu item is always visible

* SES-2811 - Do not attempt to send a failed message marked as deleted

* SES-2818 - Making sure we set the lastMessage in a thread properly, without using 'marked as deleted' messages

* SES-2464 - changed the behaviour to finish the convo activity but instead refresh the sarch on resume

* removing log
2024-10-21 15:45:02 +11:00
SessionHero01
f794458cba
Kick handling 2024-10-21 14:36:58 +11:00
SessionHero01
afb7cc1485
Leaving message sending optimisation 2024-10-21 12:01:19 +11:00
SessionHero01
88df9ff65a
Tidy up 2024-10-21 11:55:27 +11:00
SessionHero01
0657ab2305
Polling improvement for group 2024-10-21 11:04:20 +11:00
SessionHero01
4536aca327
Improvement 2024-10-21 10:59:31 +11:00
ThomasSession
952bafaf1d
Fix/conversation deletion issues (#1695)
* SES-2464 - properly heading to home root when deleting a thread

* SES-2810 - Catering for missing config contacts vs local contacts

Making sure we deleted conversations when a contact is missing from the config while existing locally
2024-10-21 09:45:16 +11:00
ThomasSession
74939da01f
Fix/message deletion issues (#1696)
* SES-2810 - Removing the screenshot privacy toggle

* SES-2813 - clickable only when there is a 'follow settings'

* SES-2815 - proper icon and spacing for deleted messages

* Simplified deletion dialog to be reused for note to self and the rest as only the labels change

* SES-2819 - Do not show a reaction on a deleted message

* Fixing up deletion details

Message view hides reactions completely if the message is marked as deleted
All  messages can now show the 'Delete' long press option
Community messages should be removed completely not marked as deleted

* Revert "SES-2819 - Do not show a reaction on a deleted message"

This reverts commit 711e31a43a.

* Avoiding adding reactions if the message is marked as deleted
2024-10-21 07:46:41 +11:00
SessionHero01
b8e98ec9ed
Update copy 2024-10-15 15:40:41 +11:00
SessionHero01
e0ea98abdd
Use config's contact directly 2024-10-15 14:48:53 +11:00
SessionHero01
1b9b5dd42c
Compilation errors 2024-10-15 14:30:25 +11:00
SessionHero01
6814f0abe2
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt
#	app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
#	app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt
#	app/src/main/res/layout/view_control_message.xml
#	app/src/test/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModelTest.kt
#	libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
#	libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt
2024-10-15 14:17:54 +11:00
ThomasSession
f6d50ac858
Feature/strings nice to haves (#1686)
* Initial commit with high level structure for new message deletion logic

* Adding admin logic

* New dialog styles

* Matching existing dialog closer to new designs

* Using the theme attribute danger instead of a hardcoded colour

* Using classes for the dialogs

Also cleaned up older references to align with newer look

* Adding cancel handling

Cleaning unused code

* Handling local deletion with batch message deletion

* Reusing the 'delete locally'

* Delete on device should "marl the message as deleted", not remove it from the db directly

* Displaying "marked as deleted" messages

Split the `BASE_DELETED_TYPE` into two types:
BASE_DELETED_OUTGOING_TYPE and BASE_DELETED_INCOMING_TYPE
so we can differentiate them visually.

* Proper handling of merged code

* Removed temp bg color

* Making sure the deleted message view is visible

* Renaming functions for clarity

* Adding the ability to customise the text for the deleted control messages

* Removing code that was added back from merging dev back in

* Using the updated strings

* Toast confirmation on 'delete locally'

* Recreating xml dialogs in Compose and moved logic in VM

* Removing hardcoded strings

* Updated message deletion logic

Still need to finalise "note to self" and "legacy groups"

* Deletion logic rework

Moving away from promises

* More deletion logic

Hndling unsend request retrieval as per figma docs

* Making sure multi-select works as expectec

* Multi message handling

Sharing admin logic

* Deleting reactions when deleting a message

* Deleting reactions when deleting a message

* Grabbing server hash from notification data

* Fixed unit tests

* Handling deletion od "marked as deleted" messages

* Handling Control Messages longpress and deletion

* Back up handling of no map data for huawei notifications

Also rethemed the send buttona dn home plus button to have better ax contrast by standardising the colour displayed on the accent color to be the same as the one on the sent messages

* Removed test line

* Reworking the deletion dialogs

We removed the 'delete locally' dialog, instead we show the 'delete for everyone' with the second option disabled

* Outgoing messages can all be marked as 'delete for everyone'

Cleaned up invisible copy button on black bgs

* Adding a confirmation dialog when clearing emoji

* Message request text update

* Restyling menu items to not show in uppercase

* Proper hint for seach

* Do not show seconds when they're 0

* Making the change to "hidden recovery" reactive so it can be dynamically updated in the settings page.

This can be simplified once we make SharedPreferences widely accessible as Flows

---------

Co-authored-by: ThomasArtProcessors <71994342+ThomasArtProcessors@users.noreply.github.com>
2024-10-15 10:53:19 +11:00
ThomasSession
68750e6146
Making sure deleted control messages leave nothing behind (#1693)
* Making sure deleted control messages leave nothing behind

* More control messages check
2024-10-14 18:49:33 +11:00
ThomasSession
54ef260aa9
Feature/standardised message deletion (#1685)
* Initial commit with high level structure for new message deletion logic

* Adding admin logic

* New dialog styles

* Matching existing dialog closer to new designs

* Using the theme attribute danger instead of a hardcoded colour

* Using classes for the dialogs

Also cleaned up older references to align with newer look

* Adding cancel handling

Cleaning unused code

* Handling local deletion with batch message deletion

* Reusing the 'delete locally'

* Delete on device should "marl the message as deleted", not remove it from the db directly

* Displaying "marked as deleted" messages

Split the `BASE_DELETED_TYPE` into two types:
BASE_DELETED_OUTGOING_TYPE and BASE_DELETED_INCOMING_TYPE
so we can differentiate them visually.

* Proper handling of merged code

* Removed temp bg color

* Making sure the deleted message view is visible

* Renaming functions for clarity

* Adding the ability to customise the text for the deleted control messages

* Removing code that was added back from merging dev back in

* Using the updated strings

* Toast confirmation on 'delete locally'

* Recreating xml dialogs in Compose and moved logic in VM

* Removing hardcoded strings

* Updated message deletion logic

Still need to finalise "note to self" and "legacy groups"

* Deletion logic rework

Moving away from promises

* More deletion logic

Hndling unsend request retrieval as per figma docs

* Making sure multi-select works as expectec

* Multi message handling

Sharing admin logic

* Deleting reactions when deleting a message

* Deleting reactions when deleting a message

* Grabbing server hash from notification data

* Fixed unit tests

* Handling deletion od "marked as deleted" messages

* Handling Control Messages longpress and deletion

* Back up handling of no map data for huawei notifications

Also rethemed the send buttona dn home plus button to have better ax contrast by standardising the colour displayed on the accent color to be the same as the one on the sent messages

* Removed test line

* Reworking the deletion dialogs

We removed the 'delete locally' dialog, instead we show the 'delete for everyone' with the second option disabled

* Outgoing messages can all be marked as 'delete for everyone'

Cleaned up invisible copy button on black bgs

* PR feedback

* Updated huawei file and tested notifications

* Fixed SES-2802

Only force the priority to visible when going from not approved to approved

* Syncing state diaplays as sent

Syncing happens in the bg so the user doesn't need to know of it hence the status can display as "Sent" during the syncing phase.
Resyncing, in case it happens, can display the "Syncing" status as it would happen after a syncing error.

* Latest strings

---------

Co-authored-by: ThomasArtProcessors <71994342+ThomasArtProcessors@users.noreply.github.com>
2024-10-14 15:33:11 +11:00
SessionHero01
007fda6bae
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/ConfigDatabase.kt
2024-10-14 14:37:46 +11:00
SessionHero01
222df30a18
Fix compilation issues 2024-10-14 14:37:13 +11:00
SessionHero01
ecfa5d346a
Close cursor in retrieveConfigLastUpdateTimestamp (#1692) 2024-10-14 14:24:48 +11:00
SessionHero01
1f9b00bc0a
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
#	libsession/src/main/java/org/session/libsession/utilities/ConfigFactoryProtocol.kt
2024-10-14 11:41:29 +11:00
ThomasSession
ed1bddd10b
Merge pull request #1691 from oxen-io/fix/ses-2804-message-reappearing-account-restored
Making sure restored accounts do not display deleted messages
2024-10-14 10:59:48 +11:00
ThomasSession
e068b710ce
Merge pull request #1690 from oxen-io/release/1.20.2
v1.20.2
2024-10-14 10:55:27 +11:00
ThomasSession
bf6157997a Making sure restored accounts do not display deleted messages
When getting messages we check if the contact was marked as hidden and compare the timestamps of both the message and the config object to check whether to re-show the thread or not.
2024-10-14 10:42:10 +11:00
ThomasSession
9ffaed51b2 v1.20.2 2024-10-11 15:37:16 +11:00
ThomasSession
2945a9231b
Merge pull request #1688 from oxen-io/fix/download-dialog-string
Fixing store crash by removing non required spannable
2024-10-11 13:56:39 +11:00
ThomasSession
92f66b4534 Fixing store crash by removing non required spannable 2024-10-11 11:53:14 +11:00
SessionHero01
7175a3121c
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
2024-10-10 13:56:05 +11:00
ThomasSession
a324cd3e1d
Merge pull request #1687 from oxen-io/fix/ses-2802
SES-2802 - Deleted message re-appearing
2024-10-10 13:55:13 +11:00
ThomasSession
ce968cc5f8 Only force a contact to visible if the approval goes from 'not approved' to 'approved' 2024-10-10 13:30:09 +11:00
SessionHero01
a8839af112
Config update details and config syncing issue 2024-10-09 10:32:05 +11:00
SessionHero01
db8784f0db
Config lock contention and loading timeout issue 2024-10-08 15:53:22 +11:00
SessionHero01
966b8e0d7f
Close group poller issue 2024-10-08 14:51:28 +11:00
SessionHero01
999ce6e413
Fixed unit tests 2024-10-08 10:41:50 +11:00
SessionHero01
4bf2c87fdd
Incorrect imports 2024-10-08 10:29:01 +11:00
SessionHero01
e937e2b354
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
2024-10-08 10:26:11 +11:00
SessionHero01
962df473b6
Fixed crashes leaving un-polled groups 2024-10-08 10:21:59 +11:00
ThomasSession
231360dd1c
Merge pull request #1683 from oxen-io/release/1.20.1
Release/1.20.1
2024-10-08 09:29:40 +11:00
SessionHero01
71009c373b
Fix up more DI 2024-10-07 17:14:18 +11:00
ThomasSession
2523975462
More DI fixes 2024-10-07 16:55:11 +11:00
SessionHero01
7f008b5f1b
Delete group thread upon config changes 2024-10-07 16:00:31 +11:00
SessionHero01
4998cebfd3
Tidy up dependency injection 2024-10-07 15:53:51 +11:00
SessionHero01
8c9dfdf5cd
Move config sync task into dedicated class 2024-10-07 15:45:36 +11:00
SessionHero01
79db7bdc5c
Tidy up storage 2024-10-07 15:45:18 +11:00
SessionHero01
d2a4f12c29
Config uploader 2024-10-07 15:05:43 +11:00