Commit Graph

9489 Commits (abd689cfd3f9d654c9d222b782e7e2d6fbd59a12)
 

Author SHA1 Message Date
SessionHero01 abd689cfd3
Check if a groupv2 conversation is admin 6 months ago
SessionHero01 be087fd575
Renamed getCloseGroup -> getGroup 6 months ago
SessionHero01 22b4479019
Handle message deletion 6 months ago
SessionHero01 b06aee7a20
Fixed up legacy group banner 6 months ago
SessionHero01 b77a35a171
Merge remote-tracking branch 'origin/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt
6 months ago
SessionHero01 5cc57fc225
Fixed up legacy group banner 6 months ago
SessionHero01 ea714a60a2
Group message deletion 6 months ago
SessionHero01 86a9e07f31
Alert text color 6 months ago
SessionHero01 5b26912f42
Fixed huawei push notification 6 months ago
SessionHero01 0518134c88
More group renaming 6 months ago
SessionHero01 e89cbdf029
Renamed group terminology 6 months ago
SessionHero01 122838d9ae
Updated icons 6 months ago
SessionHero01 6abe6c682c
clearAll + same name checking before updating 6 months ago
SessionHero01 d21cb39824
Removed a few member options under debug flag 6 months ago
SessionHero01 2fa433585a
Fixed height for group name editing 6 months ago
ThomasSession 8615c57842 Making sure the avatars refresh when changed by other users 6 months ago
SessionHero01 6e1fa1b257
UI adjustment 6 months ago
SessionHero01 74f7bbb6d5
Added bottom options dialog 6 months ago
SessionHero01 cfd04f95e3
Fixed Group control message not showing 6 months ago
SessionHero01 5e44d3f808
Fixed compilation issue 6 months ago
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
6 months ago
SessionHero01 c6aefc5fb1
Fixed merge conflicts 6 months ago
ThomasSession 16cca2d3cc
Getting the recipient from the VM (#1694) 6 months ago
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>
6 months ago
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
6 months ago
SessionHero01 01ef596d44
Remove unused files 6 months ago
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
6 months ago
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
6 months ago
SessionHero01 f794458cba
Kick handling 6 months ago
SessionHero01 afb7cc1485
Leaving message sending optimisation 6 months ago
SessionHero01 88df9ff65a
Tidy up 6 months ago
SessionHero01 0657ab2305
Polling improvement for group 6 months ago
SessionHero01 4536aca327
Improvement 6 months ago
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
6 months ago
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
6 months ago
SessionHero01 b8e98ec9ed
Update copy 6 months ago
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