Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate shared libsession-util library #1096

Merged
merged 288 commits into from
Jul 14, 2023
Merged

Conversation

0x330a
Copy link

@0x330a 0x330a commented Jan 29, 2023

No description provided.

0x330a added 29 commits June 30, 2023 16:35
…t (prevents clearing read notifications in conversation or on home screen)
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
@hjubb hjubb merged commit ac18f1c into oxen-io:dev Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

4 participants