Skip to content

Commit a150c28

Browse files
committed
fix: build errors
1 parent 343f199 commit a150c28

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/src/main/java/me/mudkip/moememos/data/api/MemosV1Api.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import retrofit2.http.Query
1515
import java.util.Date
1616

1717
interface MemosV1Api {
18-
@POST("api/v1/auth/sessions/current")
18+
@GET("api/v1/auth/sessions/current")
1919
suspend fun authStatus(): ApiResponse<GetCurrentSessionResponse>
2020

2121
@GET("api/v1/users/{id}:getSetting")

app/src/main/java/me/mudkip/moememos/ui/page/account/AccountPage.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ fun AccountPage(
103103
}
104104
}
105105
if (memosV1User != null) {
106-
Text(memosV1User.nickname,
106+
Text(memosV1User.displayName,
107107
style = MaterialTheme.typography.headlineSmall
108108
)
109-
if (memosV1User.nickname != memosV1User.email && memosV1User.email.isNotEmpty()) {
109+
if (memosV1User.displayName != memosV1User.email && memosV1User.email.isNotEmpty()) {
110110
Text(memosV1User.email,
111111
style = MaterialTheme.typography.titleSmall,
112112
color = MaterialTheme.colorScheme.outline

app/src/main/java/me/mudkip/moememos/viewmodel/AccountViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class AccountViewModel @AssistedInject constructor(
7575
}
7676
}
7777
is RemoteApi.MemosV1 -> {
78-
val user = memosApi.api.authStatus().getOrNull()
78+
val user = memosApi.api.authStatus().getOrNull()?.user
7979
val profile = memosApi.api.getProfile().getOrNull()
8080
if (user != null && profile != null) {
8181
userAndProfile = UserAndProfile.MemosV1(user, profile)

0 commit comments

Comments
 (0)