Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages

Browse Source

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java

...

This commit is contained in:

0x330a

2023-07-25 13:14:29 +10:00

parent 68248db83c 4c9a237d87

commit 36df2b37df

7 changed files with 180 additions and 1214 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1376

libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java

File diff suppressed because it is too large Load Diff