Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/noid/migrate to kotlinx #3699

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Feature/noid/migrate to kotlinx #3699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a576e5f
convert RestModule to kt
mahibi Mar 6, 2024
3d7a72f
add KotlinxJodaTimeConverter
mahibi Mar 7, 2024
50e5c17
WIP. migrate from logansquare to kotlinx
mahibi Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ dependencies {

implementation 'androidx.core:core-ktx:1.12.0'

implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.10.0'
androidTestImplementation 'org.mockito:mockito-android:5.10.0'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,7 @@ class ChatActivity :
when (recent.systemMessageType) {
ChatMessage.SystemMessageType.CALL_STARTED -> { // add CallStartedMessage with id -2
if (!callStarted) {
val callStartedChatMessage = ChatMessage()
val callStartedChatMessage = ChatMessage(token = "0")
callStartedChatMessage.jsonMessageId = CALL_STARTED_ID
callStartedChatMessage.actorId = "-2"
val name = if (recent.actorDisplayName.isNullOrEmpty()) "Guest" else recent.actorDisplayName
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import at.bitfire.dav4jvm.property.GetContentType
import at.bitfire.dav4jvm.property.GetLastModified
import at.bitfire.dav4jvm.property.ResourceType
import at.bitfire.dav4jvm.property.ResourceType.Companion.COLLECTION
import com.bluelinelabs.logansquare.annotation.JsonObject
import kotlinx.serialization.Serializable
import com.nextcloud.talk.components.filebrowser.models.properties.NCEncrypted
import com.nextcloud.talk.components.filebrowser.models.properties.NCPermission
import com.nextcloud.talk.components.filebrowser.models.properties.NCPreview
Expand All @@ -41,7 +41,7 @@ import kotlinx.parcelize.Parcelize
import java.io.File

@Parcelize
@JsonObject
@Serializable
data class BrowserFile(
var path: String? = null,
var displayName: String? = null,
Expand Down
320 changes: 0 additions & 320 deletions app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
View file
Open in desktop

This file was deleted.

Loading
Loading