TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 22:38:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always share profile as part of unblocking.

Browse Source
This commit is contained in:
Alan Evans 2020-09-03 12:28:38 -03:00 committed by Cody Henthorne
parent f88874bec8
commit 1ee747f3ef
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
View File

@ -212,12 +212,9 @@ final class MessageRequestRepository {
void unblockAndAccept(@NonNull LiveRecipient liveRecipient, long threadId, @NonNull Runnable onMessageRequestUnblocked) { void unblockAndAccept(@NonNull LiveRecipient liveRecipient, long threadId, @NonNull Runnable onMessageRequestUnblocked) {
executor.execute(() -> { executor.execute(() -> {
Recipient recipient = liveRecipient.resolve(); Recipient recipient = liveRecipient.resolve();
RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
RecipientUtil.unblock(context, recipient); RecipientUtil.unblock(context, recipient);
recipientDatabase.setProfileSharing(liveRecipient.getId(), true);
liveRecipient.refresh();
List<MessageDatabase.MarkedMessageInfo> messageIds = DatabaseFactory.getThreadDatabase(context) List<MessageDatabase.MarkedMessageInfo> messageIds = DatabaseFactory.getThreadDatabase(context)
.setEntireThreadRead(threadId); .setEntireThreadRead(threadId);

1
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
View File

@ -174,6 +174,7 @@ public class RecipientUtil {
} }
DatabaseFactory.getRecipientDatabase(context).setBlocked(recipient.getId(), false); DatabaseFactory.getRecipientDatabase(context).setBlocked(recipient.getId(), false);
DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient.getId(), true);
ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob()); ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
StorageSyncHelper.scheduleSyncForDataChange(); StorageSyncHelper.scheduleSyncForDataChange();
ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(recipient.getId())); ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(recipient.getId()));