From 7588981f10b1dcca014c65ffdd270e6ffa045dda Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 21 May 2020 11:24:09 +1000 Subject: [PATCH] Debug --- res/layout/activity_home.xml | 2 +- .../securesms/conversation/ConversationActivity.java | 3 ++- .../securesms/loki/protocol/PushEphemeralMessageSendJob.kt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml index 27d5c8b044..4079874f8a 100644 --- a/res/layout/activity_home.xml +++ b/res/layout/activity_home.xml @@ -25,7 +25,7 @@ android:id="@+id/profileButton" android:layout_width="@dimen/small_profile_picture_size" android:layout_height="@dimen/small_profile_picture_size" - android:layout_marginLeft="10dp" + android:layout_marginLeft="9dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" /> diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 55b548fb33..f3f6990de2 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -2396,7 +2396,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity // Loki - Send a friend request if we're not yet friends with the user in question LokiThreadFriendRequestStatus friendRequestStatus = DatabaseFactory.getLokiThreadDatabase(context).getFriendRequestStatus(threadId); - outgoingMessage.isFriendRequest = !isGroupConversation() && friendRequestStatus != LokiThreadFriendRequestStatus.FRIENDS; // Needed for stageOutgoingMessage(...) + outgoingMessage.isFriendRequest = !isGroupConversation() && friendRequestStatus != LokiThreadFriendRequestStatus.FRIENDS + && !SessionMetaProtocol.shared.isNoteToSelf(recipient.getAddress().serialize()); // Needed for stageOutgoingMessage(...) if (clearComposeBox) { inputPanel.clearQuote(); diff --git a/src/org/thoughtcrime/securesms/loki/protocol/PushEphemeralMessageSendJob.kt b/src/org/thoughtcrime/securesms/loki/protocol/PushEphemeralMessageSendJob.kt index fa984846e5..565d25f670 100644 --- a/src/org/thoughtcrime/securesms/loki/protocol/PushEphemeralMessageSendJob.kt +++ b/src/org/thoughtcrime/securesms/loki/protocol/PushEphemeralMessageSendJob.kt @@ -57,7 +57,7 @@ class PushEphemeralMessageSendJob private constructor(parameters: Parameters, pr val address = SignalServiceAddress(recipient) try { val udAccess = UnidentifiedAccessUtil.getAccessFor(context, Recipient.from(context, Address.fromSerialized(recipient), false)) - messageSender.sendMessage(-1, address, udAccess, dataMessage.build()) // The message ID doesn't matter + messageSender.sendMessage(0, address, udAccess, dataMessage.build()) // The message ID doesn't matter } catch (e: Exception) { Log.d("Loki", "Failed to send background message to: $recipient due to error: $e.") throw e