session-android

mirror of https://github.com/oxen-io/session-android.git synced 2025-02-28 17:27:25 +00:00

History

jubb b685846d7e Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt
#	libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupMessage.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt

2021-03-18 09:26:13 +11:00

AbstractNotificationBuilder.java

WIP clean & make things compile

2021-01-19 10:48:02 +11:00

AndroidAutoHeardReceiver.java

clean logging

2021-02-03 12:22:40 +11:00

AndroidAutoReplyReceiver.java

clean

2021-03-12 15:23:29 +11:00

DefaultMessageNotifier.java

fix: sync timing for multi device partial restore