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

Code Style Change - Disable when arrow alignment #6126

Merged
merged 7 commits into from
Jun 8, 2022
Merged

Code Style Change - Disable when arrow alignment #6126

merged 7 commits into from
Jun 8, 2022

Conversation

ericdecanini
Copy link
Contributor

@ericdecanini ericdecanini commented May 23, 2022 •
edited
Loading

Type of change

  • Feature
  • Bugfix
  • Technical
  • Other :

Content

Disables when arrow alignment

Motivation and context

Progresses #5644

Screenshots / GIFs

N/A

Tests

  • Smoke test app works as normal

Tested devices

  • Physical
  • Emulator
  • OS version(s): Android 12

Checklist

@ericdecanini
Copy link
Contributor Author

PR based off task/eric/code-style-parenthesis to avoid conflicts on develop

@bmarty
Copy link
Member

bmarty commented May 23, 2022

PR based off task/eric/code-style-parenthesis to avoid conflicts on develop

Why not basing this PR on develop to merge it faster on develop to actually avoid conflicts?

@ericdecanini
Copy link
Contributor Author

PR based off task/eric/code-style-parenthesis to avoid conflicts on develop

Why not basing this PR on develop to merge it faster on develop to actually avoid conflicts?

I specifically mean conflicts with the changes on task/eric/code-style-parenthesis. Otherwise we'd have to wait for one branch to merge to develop and then redo the other

@github-actions
Copy link

github-actions bot commented May 23, 2022 •
edited
Loading

Unit Test Results

146 files  ±0  146 suites  ±0   2m 16s ⏱️ +3s
236 tests ±0  236 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
788 runs  ±0  788 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 7d8590d. ± Comparison against base commit b6b487d.

♻️ This comment has been updated with latest results.

@bmarty
Copy link
Member

bmarty commented May 23, 2022

task/eric/code-style-parenthesis will be then to huge to be reviewed. I would prefer to merge this first on develop and rebase the code style parenthesis. The should not be any conflict.

@ericdecanini ericdecanini changed the base branch from task/eric/code-style-parenthesis to develop May 24, 2022 13:05
@ericdecanini ericdecanini changed the base branch from develop to task/eric/code-style-parenthesis May 24, 2022 13:05
@ericdecanini ericdecanini marked this pull request as draft May 24, 2022 13:05
Base automatically changed from task/eric/code-style-parenthesis to develop May 31, 2022 16:17
@ericdecanini
Merge remote-tracking branch 'origin/develop' into task/eric/when-arr…
5cc7dee 
…ow-alignment

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
#	vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
#	vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
#	vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
#	vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
#	vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@ericdecanini
Disables when arrow alignment post merge with develop
7d8590d
@ericdecanini ericdecanini marked this pull request as ready for review June 3, 2022 10:39
@ericdecanini ericdecanini requested review from a team, onurays, mnaturel and bmarty and removed request for a team June 3, 2022 13:05
bmarty
bmarty approved these changes Jun 7, 2022
View reviewed changes
Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

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

LGTM, some files have conflict, should not be hard to fix to merge this PR.

Can you add a file (.misc) for the changelog please? Thanks!

vector/src/test/java/im/vector/app/features/widgets/WebviewPermissionUtilsTest.kt
@@ -38,47 +38,53 @@ class WebviewPermissionUtilsTest {
fun filterPermissionsToBeGranted_selectedAndGrantedNothing() {
val permissions = utils.filterPermissionsToBeGranted(
selectedWebPermissions = listOf(),
androidPermissionResult = mapOf())
androidPermissionResult = mapOf()
)
Copy link
Member

Choose a reason for hiding this comment

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

Changes on this file are OK, but out of scope of this PR (as a non-blocking remark)
This is where we see that the CI does not check the formatting. Previously enabled formatting rules are not always followed. It should be the next work to do on this subject.

@bmarty
Copy link
Member

bmarty commented Jun 7, 2022

(I have fixed the conflicts)
Please just add a changelog file.

@ericdecanini ericdecanini enabled auto-merge June 8, 2022 09:02
@ericdecanini
Merge remote-tracking branch 'origin/develop' into task/eric/when-arr…
6df88fb 
…ow-alignment

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
#	vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
@ericdecanini
Reformats after merging
87053f2
@sonarqubecloud
Copy link

sonarqubecloud bot commented Jun 8, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@bmarty bmarty disabled auto-merge June 8, 2022 14:09
@bmarty bmarty merged commit 928183f into develop Jun 8, 2022
@bmarty bmarty deleted the task/eric/when-arrow-alignment branch June 8, 2022 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mnaturel mnaturel mnaturel approved these changes

@bmarty bmarty bmarty approved these changes

@onurays onurays onurays approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ericdecanini @bmarty @onurays @mnaturel