Skip to content

fix git conflict

23e8efa
Select commit
Loading
Failed to load commit list.
Open

fix(navigation): item highlight, content displaying #16284

fix git conflict
23e8efa
Select commit
Loading
Failed to load commit list.
Codacy Production / Codacy Static Code Analysis succeeded Jan 21, 2026 in 0s

Your pull request is up to standards!

Codacy Here is an overview of what got changed by this pull request:

Complexity increasing per file
==============================
- app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java  3
- app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java  1
- app/src/main/java/com/owncloud/android/MainApp.java  2
- app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java  3
- app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt  2
- app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt  2
- app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt  3
- app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt  2
- app/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.kt  2
- app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt  2
- app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt  1
- app/src/main/java/com/nextcloud/utils/extensions/NavigationViewExtensions.kt  8
         

Complexity decreasing per file
==============================
+ app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java  -6
+ app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt  -5
         

See the complete overview on Codacy