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

Feature/unwedging #1261

Merged
merged 19 commits into from
Apr 23, 2020
Merged

Feature/unwedging #1261

merged 19 commits into from
Apr 23, 2020

Conversation

bmarty
Copy link
Member

@bmarty bmarty commented Apr 20, 2020

Implement MSC1719

I'm a bit stuck now. The test is passing, but

When I implementing it a month ago, the test testUnwedging() was:

but now (after rebasing the branch), it is passing, even with 5900245

The last commit (a6368c4) contains the implementation, and the test is passing too, but we do not send any m.dummy message, markOlmSessionForUnwedging() is never called.

I think a fresh look on the code will be help full.
@BillCarsonFr could you help please?

@bmarty bmarty requested a review from BillCarsonFr April 20, 2020 16:17
// return
// }
//
// val lastForcedDate = lastNewSessionForcedDates.getObject(senderId, deviceKey) ?: 0
Copy link
Member Author

Choose a reason for hiding this comment

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

the date management is not used anymore then?

Copy link
Member

Choose a reason for hiding this comment

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

good catch, didn't know it was implemented

@@ -111,6 +111,8 @@ interface CryptoService {
roomId: String,
callback: MatrixCallback<MXEncryptEventContentResult>)

fun discardOutbundSession(roomId: String)
Copy link
Member Author

Choose a reason for hiding this comment

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

typo, a o is missing

Copy link
Member

Choose a reason for hiding this comment

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

fixed

@@ -58,6 +59,8 @@ class CommonTestHelper(context: Context) {
val matrix: Matrix

init {
Timber.plant(Timber.DebugTree())
Copy link
Member

Choose a reason for hiding this comment

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

\o/

@BillCarsonFr BillCarsonFr marked this pull request as ready for review April 23, 2020 15:01
@bmarty bmarty merged commit ed4154d into develop Apr 23, 2020
@bmarty bmarty deleted the feature/unwedging branch April 23, 2020 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants