oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity
session-android/app/src
History
0x330a 36df2b37df Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages 
# 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
2023-07-25 13:14:29 +10:00
..
androidTest fix: tests pass with forcing config 2023-07-14 18:47:10 +10:00
main Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages 2023-07-25 13:14:29 +10:00
sharedTest/java/org/thoughtcrime/securesms refactor: Use view binding to replace Kotlin synthetics (#824) 2022-01-14 07:56:15 +02:00
test Integrate shared libsession-util library (#1096) 2023-07-14 18:27:13 +10:00