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

v0.19 upgrade #1277

Merged
merged 9 commits into from
Nov 28, 2023
Merged

v0.19 upgrade #1277

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab5c5b6
Partially done with v0.19 upgrade.
dessalines Nov 15, 2023
e1f2a4e
Got login and new auth working.
dessalines Nov 21, 2023
b6f97a4
Using new pagination cursor for home and community viewmodels.
dessalines Nov 21, 2023
c0cb470
Running code analysis, fixing tests
dessalines Nov 22, 2023
5396db1
Merge remote-tracking branch 'origin/main' into v0.19_upgrade
dessalines Nov 23, 2023
8fbee77
Upgrading broken coil dep.
dessalines Nov 27, 2023
bcbafcf
Addressing PR comments 1.
dessalines Nov 28, 2023
fafd1c1
Adding customAuth to tempApi fetching, to fix login.
dessalines Nov 28, 2023
c98d41e
Fixing typo.
dessalines Nov 28, 2023
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
7 changes: 5 additions & 2 deletions app/src/main/java/com/jerboa/api/Http.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,17 +370,20 @@ interface API {

fun createTempInstance(
host: String,
auth: String? = null,
customErrorHandler: ((Exception) -> Exception?)? = null,
): API {
return buildApi(host, customErrorHandler)
return buildApi(host, auth, customErrorHandler)
}

private fun buildApi(
customUrl: String? = null,
customAuth: String? = null,
customErrorHandler: ((Exception) -> Exception?)? = null,
): API {
val currErrorHandler = customErrorHandler ?: errorHandler
val url = customUrl ?: currentInstance
val auth = customAuth ?: currentAuth
val baseUrl = buildUrl(url)

val client =
Expand All @@ -404,7 +407,7 @@ interface API {
.build()
}
}
.addInterceptor(AuthInterceptor(currentAuth))
.addInterceptor(AuthInterceptor(auth))
.addInterceptor(CustomHttpLoggingInterceptor(REDACTED_QUERY_PARAMS, REDACTED_BODY_FIELDS))
.build()

Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/com/jerboa/model/LoginViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LoginViewModel : ViewModel() {
ctx: Context,
) {
val newInstance = getHostFromInstanceString(instance)
val tempAPI = API.createTempInstance(newInstance)
var tempAPI = API.createTempInstance(newInstance)
var jwt: String

viewModelScope.launch {
Expand All @@ -59,11 +59,11 @@ class LoginViewModel : ViewModel() {
}
// Login was sucessful after this point
dessalines marked this conversation as resolved.
Show resolved Hide resolved

// Change the lemmy instance to the new one
API.changeLemmyInstance(instance, jwt)
// Change the temp lemmy instance to a new one with the auth
tempAPI = API.createTempInstance(newInstance, jwt)

// Fetch the site to get your name and id
siteViewModel.siteRes = apiWrapper(API.getInstance().getSite())
siteViewModel.siteRes = apiWrapper(tempAPI.getSite())

try {
when (val siteRes = siteViewModel.siteRes) {
Expand Down Expand Up @@ -115,6 +115,7 @@ class LoginViewModel : ViewModel() {
accountViewModel.insert(account)

loading = false
API.changeLemmyInstance(newInstance, jwt)
onGoHome()
}

Expand Down