Skip to content

Conversation

@simophin
Copy link

No description provided.

RyanRory and others added 30 commits March 27, 2023 17:18
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt
#	app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
#	app/src/main/res/drawable/profile_picture_view_large_background.xml
#	app/src/main/res/layout/dialog_download.xml
#	app/src/main/res/layout/view_untrusted_attachment.xml
#	app/src/main/res/values/strings.xml
#	app/src/test/java/org/thoughtcrime/securesms/util/OpenGroupMigrationTests.kt
#	libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
#	libsession/src/main/java/org/session/libsession/utilities/bencode/Bencode.kt
#	libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
#	libsignal/src/main/java/org/session/libsignal/utilities/IdPrefix.kt
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsession-util/libsession-util
#	libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
#	libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt
#	libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
#	libsignal/protobuf/SignalService.proto
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
…rs for user groups and serializing / deserializing the closed groups in user group type
fanchao added 27 commits July 22, 2024 14:05
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java
#	app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt
#	app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
#	build.gradle
#	gradle.properties
#	libsession/build.gradle
@simophin
Copy link
Author

Closing in flavor of #1584

@simophin simophin closed this Jul 30, 2024
@simophin simophin deleted the closed_groups branch July 30, 2024 05:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants