From 32ff26621351ef9f851bcbe2fd1aa9b3b183a340 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Fri, 17 May 2019 11:09:46 +1000
Subject: [PATCH] Fix friend request acceptance bug

---
 .../src/Loki/Extensions/TSOutgoingMessage.swift        |  4 ++--
 .../src/Loki/Messages/OWSEphemeralMessage.h            | 10 ++++++++++
 .../src/Loki/Messages/OWSEphemeralMessage.m            |  7 +++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.h
 create mode 100644 SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.m

diff --git a/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift b/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift
index f424cb5c8..637e7511e 100644
--- a/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift
+++ b/SignalServiceKit/src/Loki/Extensions/TSOutgoingMessage.swift
@@ -2,7 +2,7 @@
 @objc public extension TSOutgoingMessage {
     
     /// Loki: This is a message used to establish sessions
-    @objc public static func createEmptyOutgoingMessage(inThread thread: TSThread) -> TSOutgoingMessage {
-        return TSOutgoingMessage(in: thread, messageBody: "", attachmentId: nil)
+    @objc public static func createEmptyOutgoingMessage(inThread thread: TSThread) -> EphemeralMessage {
+        return EphemeralMessage(in: thread, messageBody: "", attachmentId: nil)
     }
 }
diff --git a/SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.h b/SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.h
new file mode 100644
index 000000000..ee0378aee
--- /dev/null
+++ b/SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.h
@@ -0,0 +1,10 @@
+#import "TSOutgoingMessage.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+NS_SWIFT_NAME(EphemeralMessage)
+@interface OWSEphemeralMessage : TSOutgoingMessage
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.m b/SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.m
new file mode 100644
index 000000000..786bba27d
--- /dev/null
+++ b/SignalServiceKit/src/Loki/Messages/OWSEphemeralMessage.m
@@ -0,0 +1,7 @@
+#import "OWSEphemeralMessage.h"
+
+@implementation OWSEphemeralMessage
+
+- (BOOL)shouldBeSaved { return NO; }
+
+@end