Skip to content

Commit 111334d

Browse files
authored
Merge pull request #173 from tinode/next
Handling of LastSeen the same way as on Android
2 parents b9980cf + 66a1806 commit 111334d

File tree

5 files changed

+101
-134
lines changed

5 files changed

+101
-134
lines changed

TinodeSDK/ComTopic.swift

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,12 @@
22
// ComTopic.swift
33
// TinodeSDK
44
//
5-
// Copyright © 2020 Tinode. All rights reserved.
5+
// Copyright © 2020-2021 Tinode LLC. All rights reserved.
66
//
77

88
import Foundation
99

1010
public class ComTopic<DP: Codable & Mergeable>: Topic<DP, PrivateType, DP, PrivateType> {
11-
override init(tinode: Tinode?, name: String, l: Listener?) {
12-
super.init(tinode: tinode, name: name, l: l)
13-
}
14-
override init(tinode: Tinode?, sub: Subscription<DP, PrivateType>) {
15-
super.init(tinode: tinode, sub: sub)
16-
}
17-
override init(tinode: Tinode?, name: String, desc: Description<DP, PrivateType>) {
18-
super.init(tinode: tinode, name: name, desc: desc)
19-
}
2011
public convenience init(in tinode: Tinode?, forwardingEventsTo l: Listener? = nil, isChannel: Bool) {
2112
let name = (isChannel ? Tinode.kChannelNew : Tinode.kTopicNew) + tinode!.nextUniqueString()
2213
self.init(tinode: tinode!, name: name, l: l)

TinodeSDK/MeTopic.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// MeTopic.swift
33
// TinodeSDK
44
//
5-
// Copyright © 2020 Tinode. All rights reserved.
5+
// Copyright © 2020-2021 Tinode LLC. All rights reserved.
66
//
77

88
import Foundation
@@ -29,10 +29,7 @@ open class MeTopic<DP: Codable & Mergeable>: Topic<DP, PrivateType, DP, PrivateT
2929

3030
private var credentials: [Credential]?
3131

32-
public init(tinode: Tinode?) {
33-
super.init(tinode: tinode, name: Tinode.kTopicMe, l: nil)
34-
}
35-
public init(tinode: Tinode?, l: MeTopic<DP>.Listener?) {
32+
public init(tinode: Tinode?, l: MeTopic<DP>.Listener? = nil) {
3633
super.init(tinode: tinode, name: Tinode.kTopicMe, l: l)
3734
}
3835
public init(tinode: Tinode?, desc: Description<DP, PrivateType>) {

TinodeSDK/Tinode.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Tinode.swift
33
// ios
44
//
5-
// Copyright © 2019 Tinode. All rights reserved.
5+
// Copyright © 2019-2021 Tinode LLC. All rights reserved.
66
//
77

88
import Foundation
@@ -674,7 +674,7 @@ public class Tinode {
674674
} else if meta.topic == Tinode.kTopicFnd {
675675
topic = DefaultFndTopic(tinode: self)
676676
} else {
677-
topic = DefaultComTopic(tinode: self, name: meta.topic!, desc: meta.desc! as! DefaultDescription)
677+
topic = DefaultComTopic(tinode: self, name: meta.topic!, desc: (meta.desc! as! DefaultDescription))
678678
}
679679

680680
return topic

0 commit comments

Comments
 (0)