mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-03 23:15:23 +00:00
b685846d7e
# 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 |
||
---|---|---|
.. | ||
AbstractNotificationBuilder.java | ||
AndroidAutoHeardReceiver.java | ||
AndroidAutoReplyReceiver.java | ||
DefaultMessageNotifier.java | ||
DeleteNotificationReceiver.java | ||
FailedNotificationBuilder.java | ||
LocaleChangedReceiver.java | ||
MarkReadReceiver.java | ||
MultipleRecipientNotificationBuilder.java | ||
NotificationChannels.java | ||
NotificationItem.java | ||
NotificationState.java | ||
OptimizedMessageNotifier.java | ||
PendingMessageNotificationBuilder.java | ||
RemoteReplyReceiver.java | ||
ReplyMethod.java | ||
SingleRecipientNotificationBuilder.java |