TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-19 08:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into libsession-integration

Browse Source 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/BackgroundGroupAddJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/GroupAvatarDownloadJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/OpenGroupDeleteJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/TrimThreadJob.kt
This commit is contained in:
0x330a
2023-02-20 11:52:25 +11:00
parent 66fb6b30e9 391418ae1e
commit 1b580cca1b
50 changed files with 874 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libsignal/src/main/java/org/session/libsignal/database/LokiOpenGroupDatabaseProtocol.kt
View File

@@ -4,4 +4,5 @@ interface LokiOpenGroupDatabaseProtocol {
fun updateTitle(groupID: String, newValue: String)
fun updateProfilePicture(groupID: String, newValue: ByteArray)
fun removeProfilePicture(groupID: String)
}