From 339eb1772b94fae8838ce5d16f92721a02b62d8c Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 2 Jun 2025 08:06:45 +0200 Subject: [PATCH 1/4] Replace some URLs --- CONTRIBUTING.md | 35 +++++++------------ README.md | 31 ++++++---------- SETUP.md | 18 +++++----- TROUBLESHOOTING.md | 2 +- issue_template.md | 12 +++---- .../authentication/LoginActivityTest.kt | 2 +- .../settings/more/SettingsMoreFragmentTest.kt | 6 ++-- .../android/extensions/ActivityExt.kt | 1 - .../android/ui/activity/DrawerActivity.kt | 3 +- owncloudApp/src/main/res/values/setup.xml | 8 ++--- owncloudApp/src/main/res/values/strings.xml | 2 +- .../lib/resources/CommonOcsResponse.kt | 2 +- .../shares/responses/ShareeResponse.kt | 2 +- .../lib/GetRemoteStatusOperationTest.kt | 4 +-- .../responses/WebFingerResponseTest.kt | 2 +- .../simple_response.json | 2 +- .../to_much_information_response.json | 2 +- .../shares/repository/OCShareRepository.kt | 2 +- .../files/repository/OCFileRepositoryTest.kt | 6 ++-- .../providers/ScopedStorageProviderTest.kt | 16 ++++----- .../OCRemoteWebFingerDataSourceTest.kt | 6 ++-- .../repository/OCWebFingerRepositoryTest.kt | 4 +-- .../domain/webfinger/model/WebFingerRel.kt | 2 +- .../domain/server/model/ServerInfoTest.kt | 12 +++---- .../usecases/GetServerInfoAsyncUseCaseTest.kt | 2 +- .../android/domain/user/model/UserInfoTest.kt | 6 ++-- .../owncloud/android/testutil/OCAccount.kt | 8 ++--- .../com/owncloud/android/testutil/OCFile.kt | 2 +- .../owncloud/android/testutil/OCServerInfo.kt | 4 +-- .../testutil/oauth/OIDCServerConfiguration.kt | 14 ++++---- 30 files changed, 99 insertions(+), 119 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2f0d108ed1..3b4f547c8e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,29 +1,24 @@ ## Submitting issues -If you have questions about how to use ownCloud, please join our [rocket chat channel][rocketchat] or our [forum][forum]. +If you have questions about how to use OpenCloud, please join our matrix channel. ### Guidelines -* [Report the issue](https://github.com/owncloud/android/issues/new) using on of our [templates][template], they include all the information we need to track down the issue. -* This repository is *only* for issues within the ownCloud Android app code. Issues in other components should be reported in their own repositories: - - [ownCloud core](https://github.com/owncloud/core/issues) - - [oCIS](https://github.com/owncloud/ocis/issues) - - [iOS client](https://github.com/owncloud/ios-app/issues) - - [Desktop client](https://github.com/owncloud/client/issues) -* Search the [existing issues](https://github.com/owncloud/android/issues) first, it's likely that your issue was already reported. +* [Report the issue](https://github.com/opencloud-eu/android/issues/new), they include all the information we need to track down the issue. +* This repository is *only* for issues within the Android app code. Issues in other components should be reported in their own repositories: + - [Repositories](https://github.com/opencloud-eu) +* Search the [existing issues](https://github.com/opencloud-eu/android/issues) first, it's likely that your issue was already reported. If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. -[template]: https://github.com/owncloud/android/tree/master/.github/ISSUE_TEMPLATE -[rocketchat]: https://talk.owncloud.com/channel/mobile -[forum]: https://central.owncloud.org/ + ## Contributing to Source Code -Thanks for wanting to contribute source code to ownCloud. That's great! +Thanks for wanting to contribute source code to OpenCloud. That's great! -Before we're able to merge your code into the ownCloud app for Android, please, check the [contribution guidelines][contribution]. +Before we're able to merge your code into the OpenCloud app for Android, please, check the contribution guidelines. ### Guidelines * Contribute your code in a feature, fix, improvement or technical enhancement branch by using one of the following branch names: @@ -36,7 +31,7 @@ Before we're able to merge your code into the ownCloud app for Android, please, Please, use the mentioned prefixes because CI system is ready to match with them. Be sure your feature, fix, improvement or technical branches are updated with latest changes in official `android/master`, it will give us a better chance to test your code before merging it with stable code. * Once you are done with your code, start a pull request to merge your contribution into official `android/master`. * Keep on using pull requests for your next contributions although you own write permissions. -* Important to mention that ownCloud Android team uses OneFlow as branching model. It's something as useful as easy: +* Important to mention that ÒpenCloud Android team uses OneFlow as branching model. It's something as useful as easy: * `master` will stay as main branch. Everything will work around it. * Feature branch: new branch created from `master`. Once it is finished and DoD accomplished, rebased and merged into `master`. @@ -46,16 +41,12 @@ Before we're able to merge your code into the ownCloud app for Android, please, Interesting [link](https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow) about this. -[contribution]: https://owncloud.com/contribute/ - ### 1. Fork and download android/master repository: -* Please follow [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) to setup ownCloud Android app work environment. +* Please follow [SETUP.md](https://github.com/opencloud-eu/android/blob/master/SETUP.md) to setup OpenCloud Android app work environment. ### 2. Create pull request: -NOTE: You must sign the [CLA](https://cla-assistant.io/owncloud/android) before your changes can be accepted! - * Create new feature, fix, improvement or technical enhancement branch from your master branch: ```git checkout -b feature/feature_name``` * Register your changes: `git add filename` * Commit your changes locally. Please, if posible use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) to add descriptive messages to the commits. Take the simplest approach: @@ -89,9 +80,9 @@ In order to check or review the stable versions, all available tags can be fetch ## Translations Please submit translations via [Transifex][transifex]. -[transifex]: https://www.transifex.com/projects/p/owncloud/ +[transifex]: https://explore.transifex.com/opencloud-eu/opencloud-eu/ ## Code of conduct -Please, read the [ownCloud code of conduct]. Being respectful and polite with other members of the community and staff is necessary to develop a better product together. +Please, read the [code of conduct]. Being respectful and polite with other members of the community and staff is necessary to develop a better product together. -[ownCloud code of conduct]: https://owncloud.com/contribute/code-of-conduct/ +[code of conduct]: https://opencloud.eu diff --git a/README.md b/README.md index 53fd4ad6d4..568e92687a 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,22 @@ -# [ownCloud](https://owncloud.org) Android app +# [OpenCloud](https://opencloud.eu) Android app + + - -| | | | | -| ---------------------------------------------- | -------------------------------------------- | ------------------------------------------- | ------------------------------------------- | ## Join development! **Build status:**
-|master (Unit tests and data instrumented tests)| ![](https://app.bitrise.io/app/7c4fbbdb2c1c0a20/status.svg?token=t2kBlsAf8d8yZftuohQnTw&branch=master)| +|master (Unit tests and data instrumented tests)| ![](https://app.bitrise.io/app/FIXME/status.svg?token=FIXME&branch=master)| | :----- | :------ | -|**master (UI tests)**| ![](https://app.bitrise.io/app/a2a0b888408d15d8/status.svg?token=6Fz1YAJL944eJLwmmbkQ9A&branch=master)| - +|**master (UI tests)**| ![](https://app.bitrise.io/app/FIXME/status.svg?token=FIXME/&branch=master)| -**Start contributing:** Make sure you read [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) when you start working on this project. Basically: Fork this repository and contribute back using pull requests to the master branch. -Easy starting points are also reviewing [pull requests](https://github.com/owncloud/android/pulls) and working on [contributions are welcome](https://github.com/owncloud/android/issues?q=is%3Aopen+is%3Aissue+label%3A%22Contributions+are+welcome%22). -**Forum:** [#Android](https://central.owncloud.org/c/android) +**Start contributing:** Make sure you read [SETUP.md](https://github.com/opencloud-eu/android/blob/master/SETUP.md) when you start working on this project. Basically: Fork this repository and contribute back using pull requests to the master branch. +Easy starting points are also reviewing [pull requests](https://github.com/opencloud-eu/android/pulls) and working on [contributions are welcome](https://github.com/opencloud-eu/android/issues?q=is%3Aopen+is%3Aissue+label%3A%22Contributions+are+welcome%22). -**License:** [GPLv2](https://github.com/owncloud/android/blob/master/LICENSE.txt) +**License:** [LICENSE.txt](https://github.com/opencloud-eu/android/blob/master/LICENSE.txt) ## Join testing! @@ -27,14 +24,8 @@ If you are interested in testing the new features before being released and give **Play Store** -1. Download ownCloud app from Play Store. -2. Go to ownCloud tab in Play Store and scroll down to the end of the view. +1. Download OpenCloud app from Play Store. +2. Go to OpenCloud tab in Play Store and scroll down to the end of the view. 3. Press the **I'M IN** button to join the beta program and your final app will be replaced with the beta one. -Note: If you want to use the ownCloud production version you have to leave the beta program, uninstall the app, and reinstall the production version. - -**F-Droid** - -1. Go to ownCloud tab in F-Droid. -2. Open versions section. -3. Download the latest version that contains beta in the name. +Note: If you want to use the OpenCloud production version you have to leave the beta program, uninstall the app, and reinstall the production version. diff --git a/SETUP.md b/SETUP.md index 424f134e22..f94ed58358 100644 --- a/SETUP.md +++ b/SETUP.md @@ -1,6 +1,6 @@ ### Setup Information -These instructions will help you to set up your development environment, get the source code of the ownCloud for Android app and build it by yourself. If you want to help developing the app take a look to the [contribution guidelines][0]. +These instructions will help you to set up your development environment, get the source code of the OpenCloud for Android app and build it by yourself. If you want to help developing the app take a look to the [contribution guidelines][0]. Sections 1) and 2) are common for any environment. The rest of the sections describe how to set up a project in different tool environments. Nowadays we recommend to use Android Studio (section 2), but you can also build the app from the command line (section 3). @@ -11,33 +11,33 @@ If you have any problem, remove the 'android' folder, start again from 1) and wo There are some tools needed, no matter what is your specific IDE or build tool of preference. -[git][1] is used to access to the different versions of the ownCloud's source code. Download and install the version appropriate for your operating system from [here][2]. Add the full path to the 'bin/' directory from your git installation into the PATH variable of your environment so that it can be used from any location. +[git][1] is used to access to the different versions of the OpenCloud's source code. Download and install the version appropriate for your operating system from [here][2]. Add the full path to the 'bin/' directory from your git installation into the PATH variable of your environment so that it can be used from any location. The [Android SDK][3] is necessary to build the app. There are different options to install it in your system, depending of the IDE you decide to use. Check Google documentation about [installation][4] for more details on these options. After installing it, add the full path to the directories 'tools/' and 'platform-tools/' from your Android SDK installation into the PATH variable of your environment. -Open a terminal and type 'android' to start the Android SDK Manager. To build the ownCloud for Android app you will need to install at least the next SDK packages: +Open a terminal and type 'android' to start the Android SDK Manager. To build the OpenCloud for Android app you will need to install at least the next SDK packages: * Android SDK Tools and Android SDK Platform-tools (already installed); upgrade to their last versions is usually a good idea. * No longer need to specify a version for the build tools, Gradle plugin uses the minimum required version by default. -* Android 12.0 (API 31), SDK Platform; needed to build the owncloud app. +* Android 12.0 (API 31), SDK Platform; needed to build the OpenCloud app. Install any other package you consider interesting, such as emulators. For other software dependencies check the details in the section corresponding to your preferred IDE or build system. -### 1. Fork and download the owncloud/android repository. +### 1. Fork and download the opencloud-eu/android repository. -You will need [git][1] to access to the different versions of the ownCloud's source code. The source code is hosted in Github and may be read by anybody without needing a Github account. You will need a Github account if you want to contribute to the development of the app with your own code. +You will need [git][1] to access to the different versions of the OpenCloud's source code. The source code is hosted in Github and may be read by anybody without needing a Github account. You will need a Github account if you want to contribute to the development of the app with your own code. Next steps will assume you have a Github account and that you will get the code from your own fork. -* In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner. +* In a web browser, go to https://github.com/opencloud-eu/android, and click the 'Fork' button near the top right corner. * Open a terminal and go on with the next steps in it. * Clone your forked repository: ```git clone https://github.com/YOURGITHUBNAME/android.git```. * Move to the project folder with ```cd android```. * Fetch and apply any changes from your remote branch 'master': ```git fetch``` + ```git rebase``` -* Make official ownCloud repo known as upstream: ```git remote add upstream https://github.com/owncloud/android.git``` +* Make official OpenCloud repo known as upstream: ```git remote add upstream https://github.com/opencloud-eu/android.git``` * Make sure to get and apply the latest changes from official android/master branch: ```git fetch upstream``` + ```git rebase upstream/master``` At this point you can continue using different tools to build the project. Section 2 and 3 describe the existing alternatives. @@ -69,7 +69,7 @@ The first time the Gradle wrapper is called, the correct Gradle version will be The generated APK file is saved in android/build/outputs/apk as android-debug.apk -[0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md +[0]: https://github.com/opencloud-eu/android/blob/master/CONTRIBUTING.md [1]: https://git-scm.com/ [2]: https://git-scm.com/downloads [3]: https://developer.android.com/sdk/index.html diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md index 951f36de9a..ae8f95ad61 100644 --- a/TROUBLESHOOTING.md +++ b/TROUBLESHOOTING.md @@ -1,4 +1,4 @@ #Troubleshooting Check the documentation for troubleshooting information: -https://doc.owncloud.com/android/troubleshooting.html \ No newline at end of file +https://docs.opencloud.eu/ \ No newline at end of file diff --git a/issue_template.md b/issue_template.md index 0c83d940e5..839cad0519 100644 --- a/issue_template.md +++ b/issue_template.md @@ -10,8 +10,8 @@ 3. -Can this problem be reproduced with the official owncloud server? -(url: https://demo.owncloud.org, user: test, password: test) +Can this problem be reproduced with the official server? +(url: https://demo.opencloud.eu) ### Environment data @@ -21,9 +21,9 @@ Device model: Stock or customized system: -ownCloud app version: +Android app version: -ownCloud server version: +Server version: ### Logs #### Web server error log @@ -31,7 +31,7 @@ ownCloud server version: Insert your webserver log here ``` -#### ownCloud log (data/owncloud.log) +#### Server log ``` -Insert your ownCloud log here +Insert your OpenCloud server log here ``` diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt index 40d91c5dcf..22fdedf65f 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt @@ -309,7 +309,7 @@ class LoginActivityTest { @Test fun checkServerInfo_isSuccess_updateUrlInput() { launchTest() - R.id.hostUrlInput.typeText("demo.owncloud.com") + R.id.hostUrlInput.typeText("demo.opencloud.eu") serverInfoLiveData.postValue(Event(UIResult.Success(SECURE_SERVER_INFO_BASIC))) diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt index 93432a238e..a4dd12adfe 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt @@ -339,14 +339,14 @@ class SettingsMoreFragmentTest { @Test fun imprintOpensUrl() { - every { moreViewModel.getImprintUrl() } returns "https://owncloud.com/mobile" + every { moreViewModel.getImprintUrl() } returns "https://opencloud.eu/mobile" launchTest() mockIntent(action = Intent.ACTION_VIEW) onView(withText(R.string.prefs_imprint)).perform(click()) - intended(hasData("https://owncloud.com/mobile")) + intended(hasData("https://opencloud.eu/mobile")) } companion object { @@ -356,7 +356,7 @@ class SettingsMoreFragmentTest { private const val PREFERENCE_RECOMMEND = "recommend" private const val PREFERENCE_FEEDBACK = "feedback" private const val PREFERENCE_IMPRINT = "imprint" - private const val FEEDBACK_MAIL = "mailto:android-app@owncloud.com" + private const val FEEDBACK_MAIL = "mailto:mail@opencloud.eu" } diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt index c1efbf2966..3e139edf89 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt @@ -355,7 +355,6 @@ fun Activity.openFeedbackDialog() { val getInContactDescription = getString( R.string.feedback_dialog_get_in_contact_description, - DrawerActivity.CENTRAL_URL, DrawerActivity.GITHUB_URL ).trimIndent() val spannableString = HtmlCompat.fromHtml(getInContactDescription, HtmlCompat.FROM_HTML_MODE_LEGACY) diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt index 735a83c123..0902a38c5d 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt @@ -608,8 +608,7 @@ abstract class DrawerActivity : ToolbarActivity() { protected abstract fun restart() companion object { - const val CENTRAL_URL = "https://central.owncloud.org/" - const val GITHUB_URL = "https://github.com/owncloud/android/issues/new/choose" + const val GITHUB_URL = "https://github.com/opencloud-eu/android/issues" private const val KEY_CHECKED_MENU_ITEM = "CHECKED_MENU_ITEM" } } diff --git a/owncloudApp/src/main/res/values/setup.xml b/owncloudApp/src/main/res/values/setup.xml index d4dc54352b..702f162f9b 100644 --- a/owncloudApp/src/main/res/values/setup.xml +++ b/owncloudApp/src/main/res/values/setup.xml @@ -20,7 +20,7 @@ true true - "https://owncloud.com/docs-guides" + "https://docs.opencloud.eu/" @@ -71,12 +71,12 @@ true true true - https://owncloud.com/android-app-privacy-policy/ - https://doc.owncloud.com/android + https://opencloud.eu/en/data-protection-notice + https://docs.opencloud.eu/ "mailto:" - "https://play.google.com/store/apps/details?id=com.owncloud.android" + "https://play.google.com/store/apps/details?id=eu.opencloud.android" "https://play.google.com/store/apps/details?id=at.bitfire.davdroid" https://play.google.com/store/apps/details?id=com.marc.files diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index ce5fddea8b..7001a1363d 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -833,7 +833,7 @@ This shortcut points to: Open link - forum or contribute in our GitHub repo]]> + GitHub repo]]> Link Button diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt index 321d06f60a..99b3c93d74 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt @@ -27,7 +27,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass // Response retrieved by OCS Rest API, used to obtain capabilities, shares and user info among others. -// More info: https://doc.owncloud.com/server/developer_manual/core/apis/ocs-capabilities.html +// More info: https://docs.opencloud.eu/server/developer_manual/core/apis/ocs-capabilities.html @JsonClass(generateAdapter = true) data class CommonOcsResponse( val ocs: OCSResponse diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponse.kt index 0cd0162a82..5d00228b02 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponse.kt @@ -28,7 +28,7 @@ import com.squareup.moshi.JsonClass /** * This was modeled according to the documentation: - * https://doc.owncloud.com/server/developer_manual/core/apis/ocs-recipient-api.html#get-shares-recipients + * https://docs.opencloud.eu/server/developer_manual/core/apis/ocs-recipient-api.html#get-shares-recipients */ @JsonClass(generateAdapter = true) data class ShareeOcsResponse( diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt index 375e9aa52f..8ecb86e41b 100644 --- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt +++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt @@ -126,11 +126,11 @@ class GetRemoteStatusOperationTest { } companion object { - const val SOME_OWNCLOUD = "some_owncloud.com" + const val SOME_OWNCLOUD = "some_opencloud.eu" const val HTTP_SOME_OWNCLOUD = "$HTTP_PREFIX$SOME_OWNCLOUD" const val HTTPS_SOME_OWNCLOUD = "$HTTPS_PREFIX$SOME_OWNCLOUD" - const val SOME_OWNCLOUD_WITH_SUBDIR = "some_owncloud.com/subdir" + const val SOME_OWNCLOUD_WITH_SUBDIR = "some_opencloud.eu/subdir" const val HTTP_SOME_OWNCLOUD_WITH_SUBDIR = "$HTTP_PREFIX$SOME_OWNCLOUD_WITH_SUBDIR" const val HTTPS_SOME_OWNCLOUD_WITH_SUBDIR = "$HTTPS_PREFIX$SOME_OWNCLOUD_WITH_SUBDIR" diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebFingerResponseTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebFingerResponseTest.kt index 7b14da998e..dd32b6531f 100644 --- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebFingerResponseTest.kt +++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebFingerResponseTest.kt @@ -23,7 +23,7 @@ class WebFingerResponseTest { fun `check rel in too much information - ok`() { val response = loadResponses(TOO_MUCH_INFORMATION_JSON)!! Assert.assertEquals("https://gast.somedomain.de", response.links!![0].href) - Assert.assertEquals("http://webfinger.owncloud/rel/server-instance", response.links!![0].rel) + Assert.assertEquals("http://webfinger.opencloud/rel/server-instance", response.links!![0].rel) } @Test(expected = JsonDataException::class) diff --git a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json index bda674491b..88155ce8cf 100644 --- a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json +++ b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json @@ -2,7 +2,7 @@ "links": [ { "href": "https://gast.somedomain.de", - "rel": "http://webfinger.owncloud/rel/server-instance" + "rel": "http://webfinger.opencloud/rel/server-instance" } ], "subject": "acct:peter.sine@gurken.xxx" diff --git a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json index 79c68f3cbb..315800dd63 100644 --- a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json +++ b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json @@ -13,7 +13,7 @@ { "gurken": "sallat", "href": "https://gast.somedomain.de", - "rel": "http://webfinger.owncloud/rel/server-instance" + "rel": "http://webfinger.opencloud/rel/server-instance" }, { "gurken": "sallat", diff --git a/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/repository/OCShareRepository.kt b/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/repository/OCShareRepository.kt index 1bcf69c74f..3b4f400c9f 100644 --- a/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/repository/OCShareRepository.kt +++ b/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/repository/OCShareRepository.kt @@ -42,7 +42,7 @@ class OCShareRepository( filePath: String, shareType: ShareType, shareeName: String, // User or group name of the target sharee. - permissions: Int, // See https://doc.owncloud.com/server/developer_manual/core/apis/ocs-share-api.html + permissions: Int, // See https://docs.opencloud.eu/server/developer_manual/core/apis/ocs-share-api.html accountName: String ) { insertShare( diff --git a/owncloudData/src/test/java/com/owncloud/android/data/files/repository/OCFileRepositoryTest.kt b/owncloudData/src/test/java/com/owncloud/android/data/files/repository/OCFileRepositoryTest.kt index 70929cc9cb..e80fde7aaa 100644 --- a/owncloudData/src/test/java/com/owncloud/android/data/files/repository/OCFileRepositoryTest.kt +++ b/owncloudData/src/test/java/com/owncloud/android/data/files/repository/OCFileRepositoryTest.kt @@ -79,7 +79,7 @@ class OCFileRepositoryTest { private val ocFileRepositorySpy = spyk(ocFileRepository) private val expectedRemotePath = OC_FOLDER_WITH_SPACE_ID.remotePath + OC_FILE_WITH_SPACE_ID.fileName - private val storagePath = "/local/storage/path/username@demo.owncloud.com/Folder/Photos/image2.jpt" + private val storagePath = "/local/storage/path/username@demo.opencloud.eu/Folder/Photos/image2.jpt" private val remoteId = "remoteId" private val searchText = "image" private val etagInConflict = "5efb0c13c688i" @@ -1212,7 +1212,7 @@ class OCFileRepositoryTest { @Test fun `moveFile returns an empty list with no OCFiles in conflict when replace parameter is false`() { val availableRemotePath = "$expectedRemotePath (1)" - val actualStoragePath = "/local/storage/path/username@demo.owncloud.com/Folder/Photos/image2 (1).jpt" + val actualStoragePath = "/local/storage/path/username@demo.opencloud.eu/Folder/Photos/image2 (1).jpt" every { remoteFileDataSource.getAvailableRemotePath( remotePath = expectedRemotePath, @@ -1863,7 +1863,7 @@ class OCFileRepositoryTest { fun `renameFile renames a file correctly`() { val newName = "image3.jpt" val newRemotePath = "/Folder/image3.jpt" - val newStoragePath = "/local/storage/path/username@demo.owncloud.com/Folder/image3.jpt" + val newStoragePath = "/local/storage/path/username@demo.opencloud.eu/Folder/image3.jpt" every { localStorageProvider.getExpectedRemotePath( remotePath = OC_FILE_WITH_SPACE_ID.remotePath, diff --git a/owncloudData/src/test/java/com/owncloud/android/data/providers/ScopedStorageProviderTest.kt b/owncloudData/src/test/java/com/owncloud/android/data/providers/ScopedStorageProviderTest.kt index ef49fe82e2..8195a9004f 100644 --- a/owncloudData/src/test/java/com/owncloud/android/data/providers/ScopedStorageProviderTest.kt +++ b/owncloudData/src/test/java/com/owncloud/android/data/providers/ScopedStorageProviderTest.kt @@ -22,11 +22,11 @@ class ScopedStorageProviderTest { private lateinit var directory: File private lateinit var filesDir: File - private val absolutePath = "/storage/emulated/0/owncloud" - private val remotePath = "/storage/emulated/0/owncloud/remotepath" + private val absolutePath = "/storage/emulated/0/opencloud" + private val remotePath = "/storage/emulated/0/opencloud/remotepath" private val spaceId = OC_SPACE_PROJECT_WITH_IMAGE.id - private val accountName = "owncloud" - private val newName = "owncloudNewName.txt" + private val accountName = "opencloud" + private val newName = "opencloudNewName.txt" private val uriEncoded = "/path/to/remote/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B" private val rootFolderName = "root_folder" private val rootFolderPath = absolutePath + File.separator + rootFolderName @@ -113,7 +113,7 @@ class ScopedStorageProviderTest { fun `getExpectedRemotePath returns expected remote path with separator in the end when there is separator and is folder true`() { val isFolder = true - val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "owncloud" + separator + val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "opencloud" + separator val expectedPath = conditionsExpectedRemotePath(parent, newName, isFolder) val actualPath = scopedStorageProvider.getExpectedRemotePath(remotePath, newName, isFolder) @@ -124,7 +124,7 @@ class ScopedStorageProviderTest { fun `getExpectedRemotePath returns expected remote path with separator in the end when is separator and is folder false`() { val isFolder = false - val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "owncloud" + separator + val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "opencloud" + separator val expectedPath = conditionsExpectedRemotePath(parent, newName, isFolder) val actualPath = scopedStorageProvider.getExpectedRemotePath(remotePath, newName, isFolder) @@ -136,7 +136,7 @@ class ScopedStorageProviderTest { fun `getExpectedRemotePath returns expected remote path with separator in the end when is not separator and is folder true`() { val isFolder = true - val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "owncloud" + val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "opencloud" val expectedPath = conditionsExpectedRemotePath(parent, newName, isFolder) val actualPath = scopedStorageProvider.getExpectedRemotePath(remotePath, newName, isFolder) @@ -147,7 +147,7 @@ class ScopedStorageProviderTest { @Test fun `getExpectedRemotePath returns expected remote path with separator in the end when is not separator and is folder false`() { val isFolder = false - val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "owncloud" + val parent = separator + "storage" + separator + "emulated" + separator + "0" + separator + "opencloud" val expectedPath = conditionsExpectedRemotePath(parent, newName, isFolder) val actualPath = scopedStorageProvider.getExpectedRemotePath(remotePath, newName, isFolder) diff --git a/owncloudData/src/test/java/com/owncloud/android/data/webfinger/datasources/implementation/OCRemoteWebFingerDataSourceTest.kt b/owncloudData/src/test/java/com/owncloud/android/data/webfinger/datasources/implementation/OCRemoteWebFingerDataSourceTest.kt index 1a57c99f61..51b6d4c329 100644 --- a/owncloudData/src/test/java/com/owncloud/android/data/webfinger/datasources/implementation/OCRemoteWebFingerDataSourceTest.kt +++ b/owncloudData/src/test/java/com/owncloud/android/data/webfinger/datasources/implementation/OCRemoteWebFingerDataSourceTest.kt @@ -44,9 +44,9 @@ class OCRemoteWebFingerDataSourceTest { private val ownCloudClient: OwnCloudClient = mockk(relaxed = true) private val ocWebFingerService: OCWebFingerService = mockk() private val urls: List = listOf( - "http://webfinger.owncloud/tests/server-instance1", - "http://webfinger.owncloud/tests/server-instance2", - "http://webfinger.owncloud/tests/server-instance3", + "http://webfinger.opencloud/tests/server-instance1", + "http://webfinger.opencloud/tests/server-instance2", + "http://webfinger.opencloud/tests/server-instance3", ) @Before diff --git a/owncloudData/src/test/java/com/owncloud/android/data/webfinger/repository/OCWebFingerRepositoryTest.kt b/owncloudData/src/test/java/com/owncloud/android/data/webfinger/repository/OCWebFingerRepositoryTest.kt index dfe649ea89..167aaaf216 100644 --- a/owncloudData/src/test/java/com/owncloud/android/data/webfinger/repository/OCWebFingerRepositoryTest.kt +++ b/owncloudData/src/test/java/com/owncloud/android/data/webfinger/repository/OCWebFingerRepositoryTest.kt @@ -36,7 +36,7 @@ class OCWebFingerRepositoryTest { private val remoteWebFingerDatasource = mockk() private val ocWebFingerRepository = OCWebFingerRepository(remoteWebFingerDatasource) - private val webFingerInstance = "http://webfinger.owncloud/tests/server-instance1" + private val webFingerInstance = "http://webfinger.opencloud/tests/server-instance1" @Test fun `getInstancesFromWebFinger returns a list of String of webfinger url`() { @@ -68,7 +68,7 @@ class OCWebFingerRepositoryTest { @Test fun `getInstancesFromAuthenticatedWebFinger returns a list of String of webfinger url`() { - val webFingerAuthenticatedResource = "acct:me@demo.owncloud.com" + val webFingerAuthenticatedResource = "acct:me@demo.opencloud.eu" every { remoteWebFingerDatasource.getInstancesFromAuthenticatedWebFinger( diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/webfinger/model/WebFingerRel.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/webfinger/model/WebFingerRel.kt index cf82633d04..3e89fd7052 100644 --- a/owncloudDomain/src/main/java/com/owncloud/android/domain/webfinger/model/WebFingerRel.kt +++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/webfinger/model/WebFingerRel.kt @@ -19,7 +19,7 @@ package com.owncloud.android.domain.webfinger.model enum class WebFingerRel(val uri: String) { - OWNCLOUD_INSTANCE("http://webfinger.owncloud/rel/server-instance"), + OWNCLOUD_INSTANCE("http://webfinger.opencloud/rel/server-instance"), // https://openid.net/specs/openid-connect-discovery-1_0.html#IssuerDiscovery OIDC_ISSUER_DISCOVERY("http://openid.net/specs/connect/1.0/issuer") diff --git a/owncloudDomain/src/test/java/com/owncloud/android/domain/server/model/ServerInfoTest.kt b/owncloudDomain/src/test/java/com/owncloud/android/domain/server/model/ServerInfoTest.kt index f5383690ab..286e630588 100644 --- a/owncloudDomain/src/test/java/com/owncloud/android/domain/server/model/ServerInfoTest.kt +++ b/owncloudDomain/src/test/java/com/owncloud/android/domain/server/model/ServerInfoTest.kt @@ -32,10 +32,10 @@ class ServerInfoTest { fun testConstructor() { val item = ServerInfo.BasicServer( "10.3.2.1", - "https://demo.owncloud.com" + "https://demo.opencloud.eu" ) - assertEquals("https://demo.owncloud.com", item.baseUrl) + assertEquals("https://demo.opencloud.eu", item.baseUrl) assertEquals("10.3.2.1", item.ownCloudVersion) assertTrue(item.isSecureConnection) } @@ -43,13 +43,13 @@ class ServerInfoTest { @Test fun testEqualsOk() { val item1 = ServerInfo.BasicServer( - baseUrl = "https://demo.owncloud.com", + baseUrl = "https://demo.opencloud.eu", ownCloudVersion = "10.3.2.1", ) val item2 = ServerInfo.BasicServer( "10.3.2.1", - "https://demo.owncloud.com", + "https://demo.opencloud.eu", ) assertTrue(item1 == item2) @@ -59,13 +59,13 @@ class ServerInfoTest { @Test fun testEqualsKo() { val item1 = ServerInfo.BasicServer( - baseUrl = "https://demo.owncloud.com", + baseUrl = "https://demo.opencloud.eu", ownCloudVersion = "10.3.2.1", ) val item2 = ServerInfo.BasicServer( "10.0.0.0", - "https://demo.owncloud.com", + "https://demo.opencloud.eu", ) assertFalse(item1 == item2) diff --git a/owncloudDomain/src/test/java/com/owncloud/android/domain/server/usecases/GetServerInfoAsyncUseCaseTest.kt b/owncloudDomain/src/test/java/com/owncloud/android/domain/server/usecases/GetServerInfoAsyncUseCaseTest.kt index c266e4e4ff..23da6e9d3f 100644 --- a/owncloudDomain/src/test/java/com/owncloud/android/domain/server/usecases/GetServerInfoAsyncUseCaseTest.kt +++ b/owncloudDomain/src/test/java/com/owncloud/android/domain/server/usecases/GetServerInfoAsyncUseCaseTest.kt @@ -35,7 +35,7 @@ class GetServerInfoAsyncUseCaseTest { private val repository: ServerInfoRepository = spyk() private val useCase = GetServerInfoAsyncUseCase((repository)) private val useCaseParams = GetServerInfoAsyncUseCase.Params( - serverPath = "http://demo.owncloud.com", + serverPath = "http://demo.opencloud.eu", creatingAccount = false, enforceOIDC = false, secureConnectionEnforced = false, diff --git a/owncloudDomain/src/test/java/com/owncloud/android/domain/user/model/UserInfoTest.kt b/owncloudDomain/src/test/java/com/owncloud/android/domain/user/model/UserInfoTest.kt index 8990c14052..9e6053677d 100644 --- a/owncloudDomain/src/test/java/com/owncloud/android/domain/user/model/UserInfoTest.kt +++ b/owncloudDomain/src/test/java/com/owncloud/android/domain/user/model/UserInfoTest.kt @@ -29,12 +29,12 @@ class UserInfoTest { val item = UserInfo( "admin", "adminOc", - "admin@owncloud.com" + "admin@opencloud.eu" ) assertEquals("admin", item.id) assertEquals("adminOc", item.displayName) - assertEquals("admin@owncloud.com", item.email) + assertEquals("admin@opencloud.eu", item.email) } @Test @@ -66,7 +66,7 @@ class UserInfoTest { val item2 = UserInfo( "admin", "adminOc", - "demo@owncloud.com" + "demo@opencloud.eu" ) assertFalse(item1 == item2) diff --git a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCAccount.kt b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCAccount.kt index 3ea908679d..e1eaa17a70 100644 --- a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCAccount.kt +++ b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCAccount.kt @@ -22,7 +22,7 @@ package com.owncloud.android.testutil import android.accounts.Account const val OC_ACCOUNT_ID = "username" -const val OC_ACCOUNT_NAME = "$OC_ACCOUNT_ID@demo.owncloud.com" +const val OC_ACCOUNT_NAME = "$OC_ACCOUNT_ID@demo.opencloud.eu" /** * Accounts @@ -53,13 +53,13 @@ const val OC_BASIC_PASSWORD = "password" * OAuth */ const val OC_OAUTH_SUPPORTED_TRUE = "TRUE" -const val OC_AUTH_TOKEN_TYPE = "owncloud.oauth2.access_token" +const val OC_AUTH_TOKEN_TYPE = "opencloud.oauth2.access_token" const val OC_ACCESS_TOKEN = "Asqweh12p93yehd10eu" const val OC_REFRESH_TOKEN = "P3sd19DSsjdp1jwdd1" const val OC_SCOPE = "email" -const val OC_REDIRECT_URI = "oc:android.owncloud.com" +const val OC_REDIRECT_URI = "oc:android.opencloud.eu" -const val OC_TOKEN_ENDPOINT = "https://owncloud.server/token" +const val OC_TOKEN_ENDPOINT = "https://opencloud.server/token" const val OC_CLIENT_AUTH = "cl13nt4uth" const val OC_CLIENT_SECRET = "cl13nts3cr3t" diff --git a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCFile.kt b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCFile.kt index ef7990e2ad..0c02b83edf 100644 --- a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCFile.kt +++ b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCFile.kt @@ -126,7 +126,7 @@ val OC_FILE_AVAILABLE_OFFLINE = OCFile( ) val OC_FILE_DOWNLOADED = OC_FILE.copy( - storagePath = "/local/storage/path/username@demo.owncloud.com/Photos/image.jpt" + storagePath = "/local/storage/path/username@demo.opencloud.eu/Photos/image.jpt" ) val OC_FILE_WITH_SPACE_ID = OCFile( diff --git a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCServerInfo.kt b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCServerInfo.kt index 45a85006fb..480f939348 100644 --- a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCServerInfo.kt +++ b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCServerInfo.kt @@ -25,8 +25,8 @@ package com.owncloud.android.testutil import com.owncloud.android.domain.server.model.ServerInfo import com.owncloud.android.testutil.oauth.OC_OIDC_SERVER_CONFIGURATION -const val OC_SECURE_BASE_URL = "https://demo.owncloud.com" -const val OC_INSECURE_BASE_URL = "http://demo.owncloud.com" +const val OC_SECURE_BASE_URL = "https://demo.opencloud.eu" +const val OC_INSECURE_BASE_URL = "http://demo.opencloud.eu" val OC_SECURE_SERVER_INFO_BASIC_AUTH = ServerInfo.BasicServer( baseUrl = OC_SECURE_BASE_URL, diff --git a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/oauth/OIDCServerConfiguration.kt b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/oauth/OIDCServerConfiguration.kt index ca25e9012c..d818d2fdb1 100644 --- a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/oauth/OIDCServerConfiguration.kt +++ b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/oauth/OIDCServerConfiguration.kt @@ -21,11 +21,11 @@ package com.owncloud.android.testutil.oauth import com.owncloud.android.domain.authentication.oauth.model.OIDCServerConfiguration val OC_OIDC_SERVER_CONFIGURATION = OIDCServerConfiguration( - authorizationEndpoint = "https://owncloud.server/authorize", - checkSessionIframe = "https://owncloud.server/check-session.html", - endSessionEndpoint = "https://owncloud.server/endsession", - issuer = "https://owncloud.server/", - registrationEndpoint = "https://owncloud.server/register", + authorizationEndpoint = "https://opencloud.server/authorize", + checkSessionIframe = "https://opencloud.server/check-session.html", + endSessionEndpoint = "https://opencloud.server/endsession", + issuer = "https://opencloud.server/", + registrationEndpoint = "https://opencloud.server/register", responseTypesSupported = listOf( "id_token token", "id_token", @@ -40,7 +40,7 @@ val OC_OIDC_SERVER_CONFIGURATION = OIDCServerConfiguration( "email", "konnect/uuid" ), - tokenEndpoint = "https://owncloud.server/token", + tokenEndpoint = "https://opencloud.server/token", tokenEndpointAuthMethodsSupported = listOf(), - userInfoEndpoint = "https://owncloud.server/userinfo" + userInfoEndpoint = "https://opencloud.server/userinfo" ) From 7977c88286da55cc1b3b5e417ea09ce4e2284376 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 2 Jun 2025 08:22:15 +0200 Subject: [PATCH 2/4] Delete/change some files we don't want anymore --- .github/ISSUE_TEMPLATE/bug_report.md | 21 +- .github/ISSUE_TEMPLATE/feature_request.md | 34 -- .github/ISSUE_TEMPLATE/release_template.md | 136 -------- .github/pull_request_template.md | 9 - .github/workflows/calens.yml | 36 --- THIRD_PARTY.txt | 3 +- .../android/de-DE/full_description.txt | 13 - .../android/de-DE/short_description.txt | 1 - .../android/en-US/full_description.txt | 14 +- .../android/en-US/short_description.txt | 2 +- issue_template.md | 37 --- user_manual/conf.py | 294 ------------------ 12 files changed, 10 insertions(+), 590 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 .github/ISSUE_TEMPLATE/release_template.md delete mode 100644 .github/pull_request_template.md delete mode 100644 .github/workflows/calens.yml delete mode 100644 fastlane/metadata/android/de-DE/full_description.txt delete mode 100644 fastlane/metadata/android/de-DE/short_description.txt delete mode 100644 issue_template.md delete mode 100644 user_manual/conf.py diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f4e55ec88e..839cad0519 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,12 +1,3 @@ ---- -name: Bug report -about: Create a bug report to help us improve -title: "[BUG]" -labels: '' -assignees: '' - ---- - ### Actual behaviour -Tell us what happens @@ -19,8 +10,8 @@ assignees: '' 3. -Can this problem be reproduced with the official owncloud server? -(url: https://ocis.ocis.master.owncloud.works, user: einstein, password: relativity) +Can this problem be reproduced with the official server? +(url: https://demo.opencloud.eu) ### Environment data @@ -30,9 +21,9 @@ Device model: Stock or customized system: -ownCloud app version: +Android app version: -ownCloud server version: +Server version: ### Logs #### Web server error log @@ -40,7 +31,7 @@ ownCloud server version: Insert your webserver log here ``` -#### ownCloud log (data/owncloud.log) +#### Server log ``` -Insert your ownCloud log here +Insert your OpenCloud server log here ``` diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 164df7f6e7..0000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: "[FEATURE REQUEST] " -labels: Feature request -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. - - -### TASKS - -- [ ] Research (if needed) -- [ ] Create branch feature/feature_name -- [ ] Development tasks - - [ ] Implement whatever - - [ ] ... - - [ ] Implement unit tests (if needed) -- [ ] Code review and apply changes requested -- [ ] Design test plan -- [ ] QA -- [ ] Merge branch feature/feature_name into master diff --git a/.github/ISSUE_TEMPLATE/release_template.md b/.github/ISSUE_TEMPLATE/release_template.md deleted file mode 100644 index 6f81f01f50..0000000000 --- a/.github/ISSUE_TEMPLATE/release_template.md +++ /dev/null @@ -1,136 +0,0 @@ ---- -name: Release -about: List of checklist to accomplish for the ownCloud team to finish the release process -title: "[RELEASE]" -labels: Release -assignees: '' ---- - - - -## Open release - -### TASKS: - - - [ ] [COM] Ping @mmattel about the new release - - [ ] [GIT] Create branch `release/M.m.p` in owncloud/android from `master` - - [ ] [DEV] Update version number and name in build.gradle in owncloudApp module - - [ ] [DOC] Update [SBOM](https://infinite.owncloud.com/f/31e6d44f-f373-557c-9ab3-1748fc0c650d$4994cd9c-1c17-4254-829a-f5ef6e1ff7e3%215080be84-fbcc-4aca-956e-b278a7090418) - - [ ] [DIS] Move Calens files from `unreleased` to a new folder like `M.m.p_YYYY-MM-DD` inside the `changelog` folder - - [ ] [DEV] Check and reorder release notes in `ReleaseNotesViewModel.kt` to assure nothing important is missing there - - [ ] [DEV] Code review - - [ ] [DIS] Generate final bundle and APK from last commit in release branch - - [ ] [COM] Prepare post in central.owncloud.org ([Category:News + Tag:android](https://central.owncloud.org/tags/c/news/5/android)) - - [ ] [DIS] Check for new screenshots in Play Store/GitHub/F-Droid and generate them - - [ ] [QA] Design test plan - - [ ] [QA] Regression test execution - - [ ] [QA] QA approval - - [ ] [DIS] Upload release APK and bundle to internal ownCloud instance - - [ ] [COM] Ping @mmattel that we are close to sign the new tags - - [ ] [DIS] Upload and publish release bundle and changelog in Play Store - - [ ] [DIS] Update screenshots in Play Store/GitHub/F-Droid - - [ ] [GIT] Create and sign tag `vM.m.p` in HEAD commit of release branch, in owncloud/android - - [ ] [GIT] Move tag `latest` pointing the same commit as the release commit - - [ ] [DIS] Publish a new [release](https://github.com/owncloud/android/releases) in owncloud/android - - [ ] [DIS] Release published in Play Store - - [ ] [COM] Publish post in central.owncloud.org ([Category:News + Tag:android](https://central.owncloud.org/tags/c/news/5/android)) - - [ ] [COM] Inform in "ownCloud General" and #general that release is out - - [ ] [GIT] Merge `master` into `release/M.m.p`, fixing all the conflicts that could happen, in owncloud/android - - [ ] [GIT] Merge without rebasing `release/M.m.p` branch into `master`, in owncloud/android - - [ ] [COM] Ping @DeepDiver1975 to update release information in https://owncloud.com/mobile-apps/ - - [ ] [DOC] Update documentation with new stuff by creating [issue](https://github.com/owncloud/docs-client-android/issues) - - -### QA - -Regression test: - -Bugs & improvements: - -- [ ] (1) ... - -_____ - -## Patch release - -### TASKS: - - - [ ] [GIT] Create branch `release/M.m.p` in owncloud/android from `latest` - - [ ] [DEV] Update version number and name in build.gradle in owncloudApp module - - [ ] [DOC] Update [SBOM](https://infinite.owncloud.com/f/31e6d44f-f373-557c-9ab3-1748fc0c650d$4994cd9c-1c17-4254-829a-f5ef6e1ff7e3%215080be84-fbcc-4aca-956e-b278a7090418) - - [ ] [DIS] Update release notes in app and changelog in `unreleased` with the proper content for the release - - [ ] [DIS] Move Calens files from `unreleased` to a new folder like `M.m.p_YYYY-MM-DD` inside the `changelog` folder - - [ ] [DIS] Copy the `unreleased` folder in `master` branch into this branch, to avoid Calens conflicts problems - - [ ] [DEV] Check and reorder release notes in `ReleaseNotesViewModel.kt` to assure nothing important is missing there - - [ ] [DEV] Code review - - [ ] [DIS] Generate final bundle and APK from last commit in the release branch - - [ ] [DIS] Check for new screenshots in Play Store/GitHub/F-Droid and generate them - - [ ] [QA] Design test plan - - [ ] [QA] Test execution - - [ ] [QA] Trigger BitRise builds for unit tests and UI tests, in case changelog conflicts avoid them in GitHub - - [ ] [QA] QA approval - - [ ] [DIS] Upload release APK and bundle to internal ownCloud instance - - [ ] [DIS] Upload and publish release bundle and changelog in Play Store - - [ ] [DIS] Update screenshots in Play Store/GitHub/F-Droid - - [ ] [GIT] Create and sign tag `vM.m.p` in HEAD commit of release branch, in owncloud/android - - [ ] [GIT] Move tag `latest` pointing the same commit as the release commit - - [ ] [DIS] Publish a new [release](https://github.com/owncloud/android/releases) in owncloud/android - - [ ] [DIS] Release published in Play Store - - [ ] [COM] Inform in "ownCloud General" and #general that release is out - - [ ] [GIT] Merge `master` into `release/M.m.p`, fixing all the conflicts that could happen, in owncloud/android - - [ ] [GIT] Merge without rebasing `release/M.m.p` branch into `master`, in owncloud/android - - [ ] [COM] Ping @DeepDiver1975 to update release information in https://owncloud.com/mobile-apps/ - - -### QA - -QA checks: - -- [ ] Smoke test -- [ ] Upgrade test - -Bugs & improvements: - -- [ ] (1) ... - - -_____ - -## Enterprise release - -### TASKS: - -- [ ] [GIT] Create branch `release/M.m.p_enterprise` in owncloud/android from `latest` (or the corresponding release tag) -- [ ] [DOC] Update [SBOM](https://infinite.owncloud.com/f/31e6d44f-f373-557c-9ab3-1748fc0c650d$4994cd9c-1c17-4254-829a-f5ef6e1ff7e3%215080be84-fbcc-4aca-956e-b278a7090418) -- [ ] [DIS] Update release notes in app and changelog in `M.m.p_YYYY-MM-DD` (already released version) with the proper content for the release -- [ ] [DIS] Copy the `unreleased` folder in `master` branch into this branch, to avoid Calens conflicts problems -- [ ] [DEV] Check and reorder release notes in `ReleaseNotesViewModel.kt` to assure nothing important is missing there -- [ ] [DEV] Code review -- [ ] [DIS] Generate final bundle and APK from last commit in the release branch -- [ ] [QA] Design test plan -- [ ] [QA] Test execution -- [ ] [QA] Trigger BitRise builds for unit tests and UI tests, in case changelog conflicts avoid them in GitHub -- [ ] [QA] QA approval -- [ ] [DIS] Upload release APK and bundle to internal ownCloud instance -- [ ] [GIT] Create and sign tag `vM.m.p_enterprise` in HEAD commit of release branch, in owncloud/android -- [ ] [DEV] Approve and merge changes in ownBrander - - [ ] Feature 1 oB https://github.com/owncloud/ownbrander/pull/ - - [ ] Feature 2 oB https://github.com/owncloud/ownbrander/pull/ - - [ ] Update version number in ownBrander -- [ ] [COM] Ping support team to block oB button -- [ ] [COM] Ping support team to deploy oB -- [ ] [QA] Generate final APKs from signed commit in builder machine and perform some basic checks - - [ ] Installation of APK/bundle generated by builder machine - - [ ] Check Feature 1 oB - - [ ] Check Feature 2 oB - - [ ] App update from previous version (generated in advance) -- [ ] [COM] Notify result in internal chat -- [ ] [COM] Ping support team to enable oB button -- [ ] [GIT] Merge `master` into `release/M.m.p_enterprise`, fixing all the conflicts that could happen, in owncloud/android -- [ ] [GIT] Merge without rebasing `release/M.m.p_enterprise` branch into `master`, in owncloud/android diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index cc94eb4965..0000000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,9 +0,0 @@ -## Related Issues -App: - -- [ ] Add changelog files for the fixed issues in folder changelog/unreleased. More info [here](https://github.com/owncloud/android/tree/master/changelog#create-changelog-items) -- [ ] Add feature to Release Notes in `ReleaseNotesViewModel.kt` creating a new `ReleaseNote()` with String resources (if required) - -_____ - -## QA diff --git a/.github/workflows/calens.yml b/.github/workflows/calens.yml deleted file mode 100644 index a010df8b6e..0000000000 --- a/.github/workflows/calens.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Calens Changelog -# This workflow is triggered on pushes to the repository. -on: - push: - branches: - - feature/* - - fix/* - - improvement/* - - release/* - - technical/* - -permissions: - contents: read - -jobs: - build: - permissions: - contents: write - runs-on: ubuntu-22.04 - name: Generate Calens Changelog - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - persist-credentials: false - - name: Run Calens - uses: actionhippie/calens@v1 - with: - target: CHANGELOG.md - - name: Commit files - uses: GuillaumeFalourd/git-commit-push@v1.3 - with: - email: devops@owncloud.com - name: ownClouders - commit_message: "docs: calens changelog updated" - access_token: ${{ secrets.GH_PAT }} diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index 57bd31e343..f8dbed5787 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -1,6 +1,7 @@ ################################################################### - ownCloud Android client + OpenCloud Android client + Copyright (C) 2025 OpenCloud GmbH Copyright (C) 2020 ownCloud GmbH. Copyright (C) 2012 Bartek Przybylski ################################################################### diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt deleted file mode 100644 index c671deacee..0000000000 --- a/fastlane/metadata/android/de-DE/full_description.txt +++ /dev/null @@ -1,13 +0,0 @@ -Willkommen bei der ownCloud Android App – Zusammen mit einem ownCloud Server haben Sie in wenigen Minuten Ihre private Filesync und –share Cloud. - -Sie suchen eine private Filesync und –share Software? Gute Neuigkeiten, die ownCloud Android App erlaubt es Ihnen Android Geräte mit einem privaten ownCloud Server in Ihrem Datenzentrum zu verbinden. ownCloud ist eine Open Source Filesync und –share Software für jedermann, von Privatpersonen mit kostenfreiem ownCloud Server bis hin zu Großunternehmen und Service Providern mit der ownCloud Enterprise Edition. ownCloud bietet eine sichere und flexible Filesync und –share Lösung – auf Servern die Sie kontrollieren. - -Mit der ownCloud Android App können Sie alle in ownCloud synchronisierten Dateien durchsuchen, neue Dateien erstellen und bearbeiten, diese Dateien und Ordner mit Kollegen teilen und die Inhalte dieser Ordner über alle Ihre Geräte hinweg synchron halten. Kopieren Sie einfach eine Datei in ein Verzeichnis auf Ihrem Server, ownCloud übernimmt für Sie den Rest. - -ownCloud bietet die Möglichkeit die richtigen Dateien zur richtigen Zeit in die richtigen Hände zu geben, gleich ob Sie ein Mobilgerät, den Desktop oder Web Client verwenden. Auf jedem Gerät und in einer leicht bedienbaren, sicheren, privaten und kontrollierten Lösung. - -Falls Sie Probleme haben sich mit dem ownCloud Server zu verbinden oder mit diesem zu synchronisieren kontaktieren Sie uns bitte auf https://github.com/owncloud/android/issues (englisch). Oftmals ist auch bereits eine Lösung in unserem Forum zu finden: https://central.owncloud.org (deutsch & englisch) - -Besuchen Sie uns unter www.ownCloud.com für weitere Informationen zu ownCloud und den ownCloud Subscriptions. Für mehr Informationen zur freien Open Source Software ownCloud Server besuchen Sie bitte www.owncloud.org . - -***Falls es zu Log-In Problemen nach einem Update kommt und Sie die ownCloud Workaround App auf Ihrem Gerät installiert haben versuchen Sie bitte die Workaround App zu deinstallieren und anschließend neu zu installieren*** diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt deleted file mode 100644 index 753cf71abb..0000000000 --- a/fastlane/metadata/android/de-DE/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Client zum Synchronisieren von Daten diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 4cece33347..677b930def 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,13 +1 @@ -Welcome to the ownCloud Android App – Add an ownCloud server, and have your private file sync and share cloud up and running in no time. - -Do you need private file sync and share software? Then good news, because the ownCloud Android App enables you to connect Android devices to a private ownCloud Server running in your data center. ownCloud is open source file sync and share software for everyone from individuals operating the free ownCloud server, to large enterprises and service providers operating under the ownCloud Enterprise Subscription. ownCloud provides a safe, secure and compliant file sync and share solution – on servers you control. - -With the ownCloud Android App you can browse all of your ownCloud synced files, create and edit new files, share these files and folders with co-workers, and keep the contents of those folders in sync across all of your devices. Simply copy a file into a directory on your server and ownCloud does the rest. - -Whether using a mobile device, a desktop, or the web client, ownCloud provides the ability to put the right files in the right hands at the right time on any device in one simple-to-use, secure, private and controlled solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way. - -Should you have any problem connecting or synchronizing with your ownCloud server, please contact us on https://github.com/owncloud/android/issues or check https://central.owncloud.org. - -Visit us at www.ownCloud.com for more information about ownCloud and the ownCloud Subscriptions. For more information on the free and open source ownCloud Server, visit www.ownCloud.org. - -*** If you are experiencing login issues after an update and the ownCloud Workaround App is installed in your device, please, try to uninstall and reinstall the Workaround App *** +OpenCloud Client diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt index 27aab68fc7..677b930def 100644 --- a/fastlane/metadata/android/en-US/short_description.txt +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -File synchronization client +OpenCloud Client diff --git a/issue_template.md b/issue_template.md deleted file mode 100644 index 839cad0519..0000000000 --- a/issue_template.md +++ /dev/null @@ -1,37 +0,0 @@ -### Actual behaviour --Tell us what happens - -### Expected behaviour --Tell us what should happen - -### Steps to reproduce -1. -2. -3. - - -Can this problem be reproduced with the official server? -(url: https://demo.opencloud.eu) - - -### Environment data -Android version: - -Device model: - -Stock or customized system: - -Android app version: - -Server version: - -### Logs -#### Web server error log -``` -Insert your webserver log here -``` - -#### Server log -``` -Insert your OpenCloud server log here -``` diff --git a/user_manual/conf.py b/user_manual/conf.py deleted file mode 100644 index 4cc7b583af..0000000000 --- a/user_manual/conf.py +++ /dev/null @@ -1,294 +0,0 @@ -# -*- coding: utf-8 -*- -# -# ownCloud Documentation documentation build configuration file, created by -# sphinx-quickstart on Mon Oct 22 23:16:40 2012. -# -# This file is execfile()d with the current directory set to its containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys, os, inspect -from datetime import datetime - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -#path to this script -scriptpath = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) - -# -- General configuration ----------------------------------------------------- - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.todo'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = [scriptpath+'/ocdoc/_shared_assets/templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# The short X.Y.Z version. -version = '2.7.0' -# The full version, including alpha/beta/rc tags. -release = '2.7.0' - -# General information about the project. -project = u'ownCloud Android App %s Manual' % (version) -copyright = u'2013-{:%Y}, The ownCloud developers'.format(datetime.now()) - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build','scripts/*', 'ocdoc/*'] - -# The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True -2 -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - - -# -- Options for HTML output --------------------------------------------------- - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -html_theme_path = [scriptpath+'/ocdoc/_shared_assets/themes'] - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -#html_theme = 'bootstrap' -html_theme = 'default' -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -html_short_title = "Android App Manual" - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = [scriptpath+'/ocdoc/_shared_assets/static'] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -html_show_sphinx = False - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'ownCloudAndroidAppManual' - - -# -- Options for LaTeX output -------------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'ownCloudAndroidAppManual.tex', u'ownCloud Android App Manual', - u'The ownCloud developers', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output -------------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('owncloud.1', 'owncloud', u'Android synchronisation and file management utility.', - [u'The ownCloud developers'], 1), - ('owncloudcmd.1', 'owncloudcmd', u'ownCloud Android app.', - [u'The ownCloud developers'], 1), -] - -# If true, show URL addresses after external links. -man_show_urls = True - - -# -- Options for Texinfo output ------------------------------------------------ - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'ownCloudClientManual', u'ownCloud Android App Manual', - u'The ownCloud developers', 'ownCloud', 'The ownCloud Android App Manual.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - - -# -- Options for Epub output --------------------------------------------------- - -# Bibliographic Dublin Core info. -epub_title = u'ownCloud Android App Manual' -epub_author = u'The ownCloud developers' -epub_publisher = u'The ownCloud developers' -epub_copyright = u'2013-{:%Y}, The ownCloud developers'.format(datetime.now()) - -# The language of the text. It defaults to the language option -# or en if the language is not set. -#epub_language = '' - -# The scheme of the identifier. Typical schemes are ISBN or URL. -#epub_scheme = '' - -# The unique identifier of the text. This can be a ISBN number -# or the project homepage. -#epub_identifier = '' - -# A unique identification for the text. -#epub_uid = '' - -# A tuple containing the cover image and cover page html template filenames. -#epub_cover = () - -# HTML files that should be inserted before the pages created by sphinx. -# The format is a list of tuples containing the path and title. -#epub_pre_files = [] - -# HTML files shat should be inserted after the pages created by sphinx. -# The format is a list of tuples containing the path and title. -#epub_post_files = [] - -# A list of files that should not be packed into the epub file. -#epub_exclude_files = [] - -# The depth of the table of contents in toc.ncx. -#epub_tocdepth = 3 - -# Allow duplicate toc entries. -#epub_tocdup = True - -# Include todos? -todo_include_todos = True From f7a1e4a2d75a0fabffcff0463c46e743280f79f8 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 3 Jun 2025 15:01:58 +0200 Subject: [PATCH 3/4] gradle: Set apk filename --- build.gradle | 18 +++++++++--------- owncloudApp/build.gradle | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 9a1efe94e6..8855590291 100644 --- a/build.gradle +++ b/build.gradle @@ -37,18 +37,18 @@ allprojects { subprojects { apply plugin: "com.google.devtools.ksp" //apply plugin: "org.jlleitschuh.gradle.ktlint" - apply plugin: "org.sonarqube" + //apply plugin: "org.sonarqube" apply plugin: "io.gitlab.arturbosch.detekt" } -sonarqube { - properties { - property "sonar.projectKey", "owncloud_android" - property "sonar.organization", "owncloud-1" - property "sonar.projectVersion", getBranchName() - property "sonar.host.url", "https://sonarcloud.io" - } -} +//sonarqube { +// properties { +// property "sonar.projectKey", "opencloud_android" +// property "sonar.organization", "opencloud-1" +// property "sonar.projectVersion", getBranchName() +// property "sonar.host.url", "https://sonarcloud.io" +// } +//} def getBranchName() { def name = "git rev-parse --abbrev-ref HEAD".execute() diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 53de6923d0..c72a7f129f 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -100,8 +100,8 @@ android { testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner" - versionCode = 45000100 - versionName = "4.5.1" + versionCode = 1 + versionName = "0.1" buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\"" buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\"" @@ -211,7 +211,7 @@ def setOutputFileName(variant, appName, callerProject) { if (appName) { newName += appName } else { - newName += "owncloud" + newName += "OpenCloud" } def versionName = "$variant.mergedFlavor.versionName" From 870e5771a41f018fc9dff9c30d6a83a8ba18bfa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 13:03:12 +0000 Subject: [PATCH 4/4] feat: bump detekt from 1.23.3 to 1.23.8 Bumps `detekt` from 1.23.3 to 1.23.8. Updates `io.gitlab.arturbosch.detekt:detekt-formatting` from 1.23.3 to 1.23.8 - [Release notes](https://github.com/detekt/detekt/releases) - [Commits](https://github.com/detekt/detekt/compare/v1.23.3...v1.23.8) Updates `io.gitlab.arturbosch.detekt:detekt-rules-libraries` from 1.23.3 to 1.23.8 - [Release notes](https://github.com/detekt/detekt/releases) - [Commits](https://github.com/detekt/detekt/compare/v1.23.3...v1.23.8) Updates `io.gitlab.arturbosch.detekt` from 1.23.3 to 1.23.8 --- updated-dependencies: - dependency-name: io.gitlab.arturbosch.detekt:detekt-formatting dependency-version: 1.23.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.gitlab.arturbosch.detekt:detekt-rules-libraries dependency-version: 1.23.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.gitlab.arturbosch.detekt dependency-version: 1.23.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8eed398b6f..778c719701 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ androidxTestMonitor = "1.6.1" androidxTestUiAutomator ="2.2.0" androidxWork = "2.8.1" coil = "2.2.2" -detekt = "1.23.3" +detekt = "1.23.8" dexopener = "2.0.5" disklrucache = "2.0.2" media3 ="1.1.1"