Skip to content

Avoid duplicated "New" wording for direct editing creator labels #17355

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

Open
ChristianTannheimer wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Avoid duplicated "New" wording for direct editing creator labels #17355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
635e23a
chore: version bump 34.1.0 RC1
alperozturk96 Jul 16, 2026
c847896
Merge pull request #17340 from nextcloud/chore/version-bump-34.1.0-rc1
alperozturk96 Jul 16, 2026
8d6c539
Avoid duplicated 'New' wording for direct editing creator labels
ChristianTannheimer Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ configurations.configureEach {
val versionMajor = 34
val versionMinor = 1
val versionPatch = 0
val versionBuild = 50 // 0-50=Alpha / 51-98=RC / 90-99=stable
val versionBuild = 51 // 0-50=Alpha / 51-98=RC / 90-99=stable

val ndkEnv = buildMap {
file("${project.rootDir}/ndk.env").readLines().forEach {
Expand Down
28 changes: 23 additions & 5 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,28 @@ class OCFileListBottomSheetDialog(
}
}

/**
* Builds the label for a Direct Editing creator entry.
*
* Some connectors (e.g. ONLYOFFICE-based ones) already provide full phrases as creator names
* ("Neues Dokument" / "New document"). Blindly prefixing the localized "New" then produces
* duplicated wording like "Neu Neues Dokument" / "New New document". Only apply the prefix
* when the creator name does not already start with it; otherwise use the name as-is.
*/
private fun buildCreatorButtonText(creatorName: String): String {
val createNew = fileActivity.getString(R.string.create_new)

return if (creatorName.trim().startsWith(createNew, ignoreCase = true)) {
creatorName
} else {
String.format(
fileActivity.getString(R.string.editor_placeholder),
createNew,
creatorName
)
}
}

@Suppress("DEPRECATION", "LongMethod", "MagicNumber")
private fun initCreatorContainer() {
val json = ArbitraryDataProviderImpl(context)
Expand Down Expand Up @@ -184,11 +206,7 @@ class OCFileListBottomSheetDialog(
gravity = Gravity.START or Gravity.CENTER_VERTICAL
setPaddingRelative(standardPadding, 0, standardPadding, 0)

val buttonText = String.format(
fileActivity.getString(R.string.editor_placeholder),
fileActivity.getString(R.string.create_new),
creator.name
)
val buttonText = buildCreatorButtonText(creator.name)
text = buttonText
setTextColor(ContextCompat.getColor(context, R.color.text_color))
textSize = 16f
Expand Down
9 changes: 9 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/340100051.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## 34.1.0 RC1 (July 16, 2026)

- Faster and better connectivity check
- Better end-to-end encryption support
- Bug fixes and performance improvements

Minimum: NC 20 Server, Android 9 Nougat

For a full list, please see https://github.com/nextcloud/android/milestone/127
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/340100051.txt.license
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
androidCommonLibraryVersion = "0.33.2"
androidGifDrawableVersion = "1.2.32"
androidImageCropperVersion = "4.7.0"
androidLibraryVersion ="25bd90c0f21b9b16acee6a7f433063040c75f30d"
androidLibraryVersion ="rc-2.25.0"
androidOpensslVersion = "3.5.6"
androidPluginVersion = "9.2.1"
androidsvgVersion = "1.4"
Expand Down
8 changes: 8 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22333,6 +22333,14 @@
<sha256 value="6e59167e6060955b1ff344cc87870b2386a5b03375ede40288f907c316326851" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="rc-2.25.0">
<artifact name="android-library-rc-2.25.0.aar">
<sha256 value="4fe766c7f7359013ed072d60062996dd98358c8a7ed8d90c71285c373ee23f12" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-rc-2.25.0.module">
<sha256 value="888995669fa2e99f521b7862f36756e57dd433eed091615bb716addb7677763a" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud-deps" name="qrcodescanner" version="0.1.2.4">
<artifact name="qrcodescanner-0.1.2.4.aar">
<sha256 value="b286128792cc04f59b0defa2c937c86d9e2fc824a8011b9af9eea7fd0ea84303" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down