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.

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

Update matrix-sdk & reaplce sled with sqlite #631

Merged
merged 10 commits into from
Jun 9, 2023

Conversation

bitfriend
Copy link
Contributor

Update matrix-sdk to latest with replacing sled with sqlite

@bitfriend bitfriend self-assigned this Jun 1, 2023
@bitfriend bitfriend added the rust label Jun 1, 2023
@bitfriend bitfriend requested a review from gnunicorn June 2, 2023 19:40
@bitfriend bitfriend marked this pull request as ready for review June 2, 2023 19:40
Comment on lines -1028 to -1030
/// whether this an acter space
fn is_acter_space() -> Future<bool>;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where did this go?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed it because Space::isActerSpace() is not used on flutter side.

Ok(c)
})
.await?
let client = config
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how come this doesn't need the RUNTIME.spawn anymore? That sounds dubious.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

login_with_token() calls new_client_config() and login_with_token_under_config().
Because login_with_token_under_config() is wrapped by RUNTIME.spawn() now, I couldn't wrap login_with_token(), caller of login_with_token_under_config() by RUNTIME.spawn().
As we know, new_client_config() contains async api of matrix and it must be spawned in tokio task.
So I wrapped new_client_config() by RUNTIME.spawn().

Ok(c)
})
.await?
let client = config.build().await.context("buidling failed in client")?;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this, too, doesn't need a RUNTIME.spawn anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same answer as above.

@bitfriend bitfriend changed the title Update matrix-sdk Update matrix-sdk & reaplce sled with sqlite Jun 8, 2023
@bitfriend bitfriend merged commit 81cb2ce into acterglobal:main Jun 9, 2023
13 checks passed
@@ -25,7 +25,7 @@ jobs:
- uses: Swatinem/rust-cache@v1
- uses: nttld/setup-ndk@v1
with:
ndk-version: r23c
ndk-version: r22b
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

downgrades like this really should be mentioned, and explained in the PR description. This is not what someone would expect to happen in this PR coming from the title and description!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants