Commit Graph

9503 Commits (dfc69420baac0b9e91d6d438a14b8f434d00e728)
 

Author SHA1 Message Date
SessionHero01 e0ea98abdd
Use config's contact directly 6 months ago
SessionHero01 1b9b5dd42c
Compilation errors 6 months ago
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
6 months ago
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>
6 months ago
ThomasSession 68750e6146
Making sure deleted control messages leave nothing behind (#1693)
* Making sure deleted control messages leave nothing behind

* More control messages check
6 months ago
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>
6 months ago
SessionHero01 007fda6bae
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/ConfigDatabase.kt
6 months ago
SessionHero01 222df30a18
Fix compilation issues 6 months ago
SessionHero01 ecfa5d346a
Close cursor in retrieveConfigLastUpdateTimestamp (#1692) 6 months ago
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
6 months ago
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
6 months ago
ThomasSession e068b710ce
Merge pull request #1690 from oxen-io/release/1.20.2
v1.20.2
6 months ago
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.
6 months ago
ThomasSession 9ffaed51b2 v1.20.2 6 months ago
ThomasSession 2945a9231b
Merge pull request #1688 from oxen-io/fix/download-dialog-string
Fixing store crash by removing non required spannable
6 months ago
ThomasSession 92f66b4534 Fixing store crash by removing non required spannable 6 months ago
SessionHero01 7175a3121c
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
6 months ago
ThomasSession a324cd3e1d
Merge pull request #1687 from oxen-io/fix/ses-2802
SES-2802 - Deleted message re-appearing
6 months ago
ThomasSession ce968cc5f8 Only force a contact to visible if the approval goes from 'not approved' to 'approved' 6 months ago
SessionHero01 a8839af112
Config update details and config syncing issue 6 months ago
SessionHero01 db8784f0db
Config lock contention and loading timeout issue 6 months ago
SessionHero01 966b8e0d7f
Close group poller issue 6 months ago
SessionHero01 999ce6e413
Fixed unit tests 6 months ago
SessionHero01 4bf2c87fdd
Incorrect imports 6 months ago
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
6 months ago
SessionHero01 962df473b6
Fixed crashes leaving un-polled groups 6 months ago
ThomasSession 231360dd1c
Merge pull request #1683 from oxen-io/release/1.20.1
Release/1.20.1
6 months ago
SessionHero01 71009c373b
Fix up more DI 6 months ago
ThomasSession 2523975462
More DI fixes 6 months ago
SessionHero01 7f008b5f1b
Delete group thread upon config changes 6 months ago
SessionHero01 4998cebfd3
Tidy up dependency injection 6 months ago
SessionHero01 8c9dfdf5cd
Move config sync task into dedicated class 6 months ago
SessionHero01 79db7bdc5c
Tidy up storage 6 months ago
SessionHero01 d2a4f12c29
Config uploader 6 months ago
ThomasSession b5954752c6 Using appropriate name 6 months ago
ThomasSession c095427835 Build process update
Cleaned up the variant outputs for the huawei build
Added local signing configs
Made sure the output names were formatted properly
6 months ago
ThomasSession a3abf94b6b Latest translations 6 months ago
ThomasSession d257a1a072 Moving recovery password dialogs to compose for QA 6 months ago
ThomasSession 390757fe50 Updating QA tags for dialogs as per the QA Team's instructions 6 months ago
ThomasSession 8fec296c11 Fixing Crashes 6 months ago
ThomasSession b237faa21d Fixing ANRs 6 months ago
SessionHero01 80344f0ffd
Incorrect timestamp 6 months ago
SessionHero01 02df41e848
Updated libsession-util 6 months ago
SessionHero01 8dd2f364ce
Group keys and message response improvement 6 months ago
SessionHero01 08ee07f5c5
Send message improvement 6 months ago
SessionHero01 6ab4ff2e28
Compilation errors after merge 6 months ago
SessionHero01 677cd6a7cf
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.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/ConversationMenuHelper.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
#	app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt
6 months ago
SessionHero01 49b9ec9914
Expiring message handling for groups 6 months ago
SessionHero01 a5c89d8d5a
Clock management and kicked 6 months ago
SessionHero01 1f5fde0d9a
Various issues 6 months ago