TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 14:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added database to map thread to loki friend request

Browse Source
This commit is contained in:
Mikunj
2019-06-17 11:57:40 +10:00
parent d7bb828d67
commit d44081d040
9 changed files with 102 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,7 @@ import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
import org.thoughtcrime.securesms.linkpreview.LinkPreview;
import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
import org.thoughtcrime.securesms.loki.LokiFriendRequestStatus;
import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
import org.thoughtcrime.securesms.mediasend.Media;
import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
@@ -2151,12 +2152,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
ApplicationContext.getInstance(context).getTypingStatusSender().onTypingStopped(threadId);
} else {
message = new OutgoingTextMessage(recipient, messageBody, expiresIn, subscriptionId);
// Loki - Always send friend requests if we're not friends with the user
int friendRequestStatus = DatabaseFactory.getThreadDatabase(context).getFriendRequestStatus(threadId);
message.isFriendRequest = (friendRequestStatus != ThreadDatabase.LokiFriendRequestStatus.FRIENDS);
}
// Loki - Always send friend requests if we're not friends with the user
int friendRequestStatus = DatabaseFactory.getLokiThreadFriendRequestDatabase(context).getFriendRequestStatus(threadId);
message.isFriendRequest = (friendRequestStatus != LokiFriendRequestStatus.FRIENDS);
Permissions.with(this)
.request(Manifest.permission.SEND_SMS)
.ifNecessary(forceSms || !isSecureText)