misc: fix warnings
Change-Id: Iab3073526d8f58f00f0ab890e04c4b01ca7155a1
diff --git a/Ring/jamiNotificationExtension/Adapter.mm b/Ring/jamiNotificationExtension/Adapter.mm
index 4a81863..dfff8f4 100644
--- a/Ring/jamiNotificationExtension/Adapter.mm
+++ b/Ring/jamiNotificationExtension/Adapter.mm
@@ -135,16 +135,6 @@
hasVideo:hasVideo];
}
}));
- //Contact added signal
- confHandlers.insert(exportable_callback<ConfigurationSignal::ContactAdded>([&](const std::string& accountId,
- const std::string& uri,
- bool confirmed) {
- if(Adapter.delegate) {
- NSString* accountIdStr = [NSString stringWithUTF8String:accountId.c_str()];
- NSString* uriStr = [NSString stringWithUTF8String:uri.c_str()];
- [Adapter.delegate receivedContactRequestWithAccountId: accountIdStr peerId: uriStr];
- }
- }));
confHandlers.insert(exportable_callback<ConversationSignal::ConversationRequestReceived>([&](const std::string& accountId, const std::string& conversationId, std::map<std::string, std::string> metadata) {
if(Adapter.delegate) {
diff --git a/Ring/jamiNotificationExtension/AdapterDelegate.swift b/Ring/jamiNotificationExtension/AdapterDelegate.swift
index 33fce69..a55c66a 100644
--- a/Ring/jamiNotificationExtension/AdapterDelegate.swift
+++ b/Ring/jamiNotificationExtension/AdapterDelegate.swift
@@ -30,6 +30,5 @@
func dataTransferEvent(withFileId transferId: String, withEventCode eventCode: Int, accountId: String, conversationId: String, interactionId: String)
func conversationSyncCompleted(accountId: String)
func receivedCallConnectionRequest(accountId: String, peerId: String, hasVideo: Bool)
- func receivedContactRequest(accountId: String, peerId: String)
func receivedConversationRequest(accountId: String, conversationId: String, metadata: [String: String])
}
diff --git a/Ring/jamiNotificationExtension/AdapterService.swift b/Ring/jamiNotificationExtension/AdapterService.swift
index 01e3ec4..5ea69b1 100644
--- a/Ring/jamiNotificationExtension/AdapterService.swift
+++ b/Ring/jamiNotificationExtension/AdapterService.swift
@@ -184,10 +184,6 @@
handler(.call, EventData(accountId: accountId, jamiId: peerId, content: "\(hasVideo)"))
}
- func receivedContactRequest(accountId: String, peerId: String) {
- /// TODO add invitation notification
- }
-
func receivedConversationRequest(accountId: String, conversationId: String, metadata: [String: String]) {
guard let handler = self.eventHandler else {
return
diff --git a/Ring/jamiNotificationExtension/EventData.swift b/Ring/jamiNotificationExtension/EventData.swift
index 2e32ed8..7179060 100644
--- a/Ring/jamiNotificationExtension/EventData.swift
+++ b/Ring/jamiNotificationExtension/EventData.swift
@@ -17,6 +17,7 @@
struct EventData {
var accountId, jamiId, conversationId, content, groupTitle: String
+
init(accountId: String = "", jamiId: String = "", conversationId: String = "", content: String = "", groupTitle: String = "") {
self.accountId = accountId
self.jamiId = jamiId