Reformats project based on editorconfig #5953
Conversation
ericdecanini
requested review from
bmarty and
ouchadam
and removed request for
bmarty
| @@ -83,7 +83,8 @@ class ExportEncryptionTest { | |||
| @Test | |||
| fun checkExportDecrypt1() { | |||
| val password = "password" | |||
| val input = "-----BEGIN MEGOLM SESSION DATA-----\nAXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\n" + "cissyYBxjsfsAndErh065A8=\n-----END MEGOLM SESSION DATA-----" | |||
| val input = | |||
| "-----BEGIN MEGOLM SESSION DATA-----\nAXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\n" + "cissyYBxjsfsAndErh065A8=\n-----END MEGOLM SESSION DATA-----" | |||
There was a problem hiding this comment.
Must be because of long line wrapping (even though it still exceeds like this). Updated to put it on the same line anyway
| ) | ||
| is GlobalError.CertificateError -> | ||
| consentNotGivenHelper.displayDialog(globalError.consentUri, | ||
| activeSessionHolder.getActiveSession().sessionParams.homeServerHost ?: "") |
There was a problem hiding this comment.
Looks like this change in the "revert" commit is not expected. Can you double check that this file is properly formatted?
There was a problem hiding this comment.
Again caused by long line wrapping. Extracted it out into a private function to make it work with formatting and just generally look cleaner
There was a problem hiding this comment.
I was not clear: there should be a line break after (, and another one before )
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.api.auth |
There was a problem hiding this comment.
wasn't expecting such a large diff for this file, I'm guessing the line separator character has been switched to the project defined one 🤔
Type of change
Content
Reformats project based on editorconfig
Motivation and context
The project was previously reformatted using AS settings (from preferences) that mimiced our current editorconfig. The reason for this approach at the time was to reduce the initial impact of the reformat.
After doing this, we encountered some annoyances that when we reformat the code in our own PRs, we incur additional formatting changes. This PR reformats the project once more based on the current editorconfig to finalise the formatting with the current code style and so that we don't incur such annoyances.
For context, we did discuss changing
ij_kotlin_code_style_defaultstoKOTLIN_OLD_DEFAULTSbut we know that we are going to change that in the future anyway so we decided we might as well do it now.Screenshots / GIFs
N/A
Tests
Smoke test app still works. No changes should incur as changes are purely code formatting
Tested devices
Checklist