Skip to content

Commit c777f00

Browse files
authored
Bug Fixes for integration on iOS and Android (#100)
* no message * Remove hilt view model for Room Edit * remove ATAK key
1 parent 0f93127 commit c777f00

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

sdks/kotlin/src/main/java/com/ditto/dittochat/ui/RoomEditViewModel.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ import kotlinx.coroutines.launch
99
import javax.inject.Inject
1010
import com.ditto.dittochat.DittoChat
1111
import com.ditto.dittochat.RoomConfig
12+
import kotlinx.coroutines.CoroutineScope
13+
import kotlinx.coroutines.Dispatchers
1214

1315
class RoomEditViewModel(
1416
private val dittoChat: DittoChat
15-
) : ViewModel() {
17+
) {
1618

1719
private val _roomName = MutableStateFlow("")
1820
val roomName: StateFlow<String> = _roomName.asStateFlow()
@@ -29,7 +31,7 @@ class RoomEditViewModel(
2931
fun createRoom(onSuccess: () -> Unit) {
3032
if (_roomName.value.isEmpty()) return
3133

32-
viewModelScope.launch {
34+
CoroutineScope(Dispatchers.Main).launch {
3335
_isCreating.value = true
3436
try {
3537
dittoChat.createRoom(

sdks/swift/Sources/DittoChatCore/Data/DittoService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ extension DittoService {
226226
let retentionDaysAgo = Date().addingTimeInterval(-retentionDaysDouble * 24 * 60 * 60)
227227
let query = """
228228
SELECT * FROM COLLECTION `\(room.messagesId)` (\(thumbnailImageTokenKey) ATTACHMENT, \(largeImageTokenKey) ATTACHMENT)
229-
WHERE roomId == :roomId AND createdOn >= :date OR timeMs >= :dateMs OR b >= :dateMs
229+
WHERE roomId == :roomId AND createdOn >= :date
230230
ORDER BY \(createdOnKey) ASC
231231
"""
232232
let args: [String: Any?] = [

0 commit comments

Comments
 (0)