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

Fix missing delegate & friend request acceptance

Browse Source
This commit is contained in:
Niels Andriesse 2019-06-28 14:59:25 +10:00
parent 52a0b2a5e8
commit e8bece45b9
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -145,6 +145,7 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.events.ReminderUpdateEvent; import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
import org.thoughtcrime.securesms.giph.ui.GiphyActivity; import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob; import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
import org.thoughtcrime.securesms.jobs.PushDecryptJob;
import org.thoughtcrime.securesms.jobs.RetrieveProfileJob; import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob; import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob;
import org.thoughtcrime.securesms.linkpreview.LinkPreview; import org.thoughtcrime.securesms.linkpreview.LinkPreview;
@ -2684,11 +2685,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
// region Loki // region Loki
@Override @Override
public void acceptFriendRequest(@NotNull MessageRecord friendRequest) { public void acceptFriendRequest(@NotNull MessageRecord friendRequest) {
DatabaseFactory.getLokiThreadFriendRequestDatabase(this).setFriendRequestStatus(this.threadId, LokiThreadFriendRequestStatus.FRIENDS); DatabaseFactory.getLokiThreadFriendRequestDatabase(this).setFriendRequestStatus(this.threadId, LokiThreadFriendRequestStatus.FRIENDS);
// TODO: Send empty message String contactID = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(this.threadId).getAddress().toString();
new PushDecryptJob(this).sendEmptyMessage(contactID); // TODO: Use a better approach for this
} }
@Override @Override

6
src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
View File

@ -202,6 +202,9 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
MessageRecord nextRecord = adapterPosition > 0 && !isHeaderPosition(adapterPosition - 1) ? getRecordForPositionOrThrow(adapterPosition - 1) : null; MessageRecord nextRecord = adapterPosition > 0 && !isHeaderPosition(adapterPosition - 1) ? getRecordForPositionOrThrow(adapterPosition - 1) : null;
BindableConversationItem conversationItem = viewHolder.getView(); BindableConversationItem conversationItem = viewHolder.getView();
if (conversationItem instanceof ConversationItem) {
((ConversationItem)conversationItem).friendRequestViewDelegate = this.friendRequestViewDelegate;
}
conversationItem.bind(messageRecord, conversationItem.bind(messageRecord,
Optional.fromNullable(previousRecord), Optional.fromNullable(previousRecord),
Optional.fromNullable(nextRecord), Optional.fromNullable(nextRecord),
@ -211,9 +214,6 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
recipient, recipient,
searchQuery, searchQuery,
messageRecord == recordToPulseHighlight); messageRecord == recordToPulseHighlight);
if (conversationItem instanceof ConversationItem) {
((ConversationItem)conversationItem).friendRequestViewDelegate = this.friendRequestViewDelegate;
}
if (messageRecord == recordToPulseHighlight) { if (messageRecord == recordToPulseHighlight) {
recordToPulseHighlight = null; recordToPulseHighlight = null;

2
src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
View File

@ -867,7 +867,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
} }
} }
private void sendEmptyMessage(String contactHexEncodedPublicKey) { public void sendEmptyMessage(String contactHexEncodedPublicKey) {
try { try {
SignalServiceAddress address = new SignalServiceAddress(contactHexEncodedPublicKey); SignalServiceAddress address = new SignalServiceAddress(contactHexEncodedPublicKey);
SignalServiceDataMessage message = new SignalServiceDataMessage(System.currentTimeMillis(), ""); SignalServiceDataMessage message = new SignalServiceDataMessage(System.currentTimeMillis(), "");