Skip to content

Commit 339eb17

Browse files
committed
Replace some URLs
1 parent 4efc362 commit 339eb17

30 files changed

Lines changed: 99 additions & 119 deletions

File tree

CONTRIBUTING.md

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
11
## Submitting issues
22

3-
If you have questions about how to use ownCloud, please join our [rocket chat channel][rocketchat] or our [forum][forum].
3+
If you have questions about how to use OpenCloud, please join our matrix channel.
44

55
### Guidelines
6-
* [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.
7-
* This repository is *only* for issues within the ownCloud Android app code. Issues in other components should be reported in their own repositories:
8-
- [ownCloud core](https://github.com/owncloud/core/issues)
9-
- [oCIS](https://github.com/owncloud/ocis/issues)
10-
- [iOS client](https://github.com/owncloud/ios-app/issues)
11-
- [Desktop client](https://github.com/owncloud/client/issues)
12-
* Search the [existing issues](https://github.com/owncloud/android/issues) first, it's likely that your issue was already reported.
6+
* [Report the issue](https://github.com/opencloud-eu/android/issues/new), they include all the information we need to track down the issue.
7+
* This repository is *only* for issues within the Android app code. Issues in other components should be reported in their own repositories:
8+
- [Repositories](https://github.com/opencloud-eu)
9+
* Search the [existing issues](https://github.com/opencloud-eu/android/issues) first, it's likely that your issue was already reported.
1310

1411
If your issue appears to be a bug, and hasn't been reported, open a new issue.
1512

1613
Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
1714

18-
[template]: https://github.com/owncloud/android/tree/master/.github/ISSUE_TEMPLATE
19-
[rocketchat]: https://talk.owncloud.com/channel/mobile
20-
[forum]: https://central.owncloud.org/
15+
2116

2217
## Contributing to Source Code
2318

24-
Thanks for wanting to contribute source code to ownCloud. That's great!
19+
Thanks for wanting to contribute source code to OpenCloud. That's great!
2520

26-
Before we're able to merge your code into the ownCloud app for Android, please, check the [contribution guidelines][contribution].
21+
Before we're able to merge your code into the OpenCloud app for Android, please, check the contribution guidelines.
2722

2823
### Guidelines
2924
* 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,
3631
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.
3732
* Once you are done with your code, start a pull request to merge your contribution into official `android/master`.
3833
* Keep on using pull requests for your next contributions although you own write permissions.
39-
* Important to mention that ownCloud Android team uses OneFlow as branching model. It's something as useful as easy:
34+
* Important to mention that ÒpenCloud Android team uses OneFlow as branching model. It's something as useful as easy:
4035

4136
* `master` will stay as main branch. Everything will work around it.
4237
* 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,
4641

4742
Interesting [link](https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow) about this.
4843

49-
[contribution]: https://owncloud.com/contribute/
50-
5144
### 1. Fork and download android/master repository:
5245

53-
* Please follow [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) to setup ownCloud Android app work environment.
46+
* Please follow [SETUP.md](https://github.com/opencloud-eu/android/blob/master/SETUP.md) to setup OpenCloud Android app work environment.
5447

5548
### 2. Create pull request:
5649

57-
NOTE: You must sign the [CLA](https://cla-assistant.io/owncloud/android) before your changes can be accepted!
58-
5950
* Create new feature, fix, improvement or technical enhancement branch from your master branch: ```git checkout -b feature/feature_name```
6051
* Register your changes: `git add filename`
6152
* 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
8980
## Translations
9081
Please submit translations via [Transifex][transifex].
9182

92-
[transifex]: https://www.transifex.com/projects/p/owncloud/
83+
[transifex]: https://explore.transifex.com/opencloud-eu/opencloud-eu/
9384

9485
## Code of conduct
95-
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.
86+
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.
9687

97-
[ownCloud code of conduct]: https://owncloud.com/contribute/code-of-conduct/
88+
[code of conduct]: https://opencloud.eu

README.md

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,31 @@
1-
# [ownCloud](https://owncloud.org) Android app
1+
# [OpenCloud](https://opencloud.eu) Android app
2+
3+
<a href="https://play.google.com/store/apps/details?id=eu.opencloud.android"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="75"></a>
24

3-
<a href="https://play.google.com/store/apps/details?id=com.owncloud.android"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="75"></a><a href="https://f-droid.org/packages/com.owncloud.android/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75"></a>
45

5-
| <img src="docs_resources/filelist_device.png"> | <img src="docs_resources/photos_device.png"> | <img src="docs_resources/share_device.png"> | <img src="docs_resources/spaces_device.png"> |
6-
| ---------------------------------------------- | -------------------------------------------- | ------------------------------------------- | ------------------------------------------- |
76

87
## Join development!
98

109
**Build status:** <br>
1110

12-
|master (Unit tests and data instrumented tests)| ![](https://app.bitrise.io/app/7c4fbbdb2c1c0a20/status.svg?token=t2kBlsAf8d8yZftuohQnTw&branch=master)|
11+
|master (Unit tests and data instrumented tests)| ![](https://app.bitrise.io/app/FIXME/status.svg?token=FIXME&branch=master)|
1312
| :----- | :------ |
14-
|**master (UI tests)**| ![](https://app.bitrise.io/app/a2a0b888408d15d8/status.svg?token=6Fz1YAJL944eJLwmmbkQ9A&branch=master)|
15-
13+
|**master (UI tests)**| ![](https://app.bitrise.io/app/FIXME/status.svg?token=FIXME/&branch=master)|
1614

17-
**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.
18-
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).
1915

20-
**Forum:** [#Android](https://central.owncloud.org/c/android)
16+
**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.
17+
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).
2118

22-
**License:** [GPLv2](https://github.com/owncloud/android/blob/master/LICENSE.txt)
19+
**License:** [LICENSE.txt](https://github.com/opencloud-eu/android/blob/master/LICENSE.txt)
2320

2421
## Join testing!
2522

2623
If you are interested in testing the new features before being released and give us your feedback, please try out our beta channels:
2724

2825
**Play Store**
2926

30-
1. Download ownCloud app from Play Store.
31-
2. Go to ownCloud tab in Play Store and scroll down to the end of the view.
27+
1. Download OpenCloud app from Play Store.
28+
2. Go to OpenCloud tab in Play Store and scroll down to the end of the view.
3229
3. Press the **I'M IN** button to join the beta program and your final app will be replaced with the beta one.
3330

34-
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.
35-
36-
**F-Droid**
37-
38-
1. Go to ownCloud tab in F-Droid.
39-
2. Open versions section.
40-
3. Download the latest version that contains beta in the name.
31+
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.

SETUP.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Setup Information
22

3-
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].
3+
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].
44

55
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).
66

@@ -11,33 +11,33 @@ If you have any problem, remove the 'android' folder, start again from 1) and wo
1111

1212
There are some tools needed, no matter what is your specific IDE or build tool of preference.
1313

14-
[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.
14+
[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.
1515

1616
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.
1717

18-
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:
18+
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:
1919

2020
* Android SDK Tools and Android SDK Platform-tools (already installed); upgrade to their last versions is usually a good idea.
2121
* No longer need to specify a version for the build tools, Gradle plugin uses the minimum required version by default.
22-
* Android 12.0 (API 31), SDK Platform; needed to build the owncloud app.
22+
* Android 12.0 (API 31), SDK Platform; needed to build the OpenCloud app.
2323

2424
Install any other package you consider interesting, such as emulators.
2525

2626
For other software dependencies check the details in the section corresponding to your preferred IDE or build system.
2727

2828

29-
### 1. Fork and download the owncloud/android repository.
29+
### 1. Fork and download the opencloud-eu/android repository.
3030

31-
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.
31+
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.
3232

3333
Next steps will assume you have a Github account and that you will get the code from your own fork.
3434

35-
* In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner.
35+
* In a web browser, go to https://github.com/opencloud-eu/android, and click the 'Fork' button near the top right corner.
3636
* Open a terminal and go on with the next steps in it.
3737
* Clone your forked repository: ```git clone https://github.com/YOURGITHUBNAME/android.git```.
3838
* Move to the project folder with ```cd android```.
3939
* Fetch and apply any changes from your remote branch 'master': ```git fetch``` + ```git rebase```
40-
* Make official ownCloud repo known as upstream: ```git remote add upstream https://github.com/owncloud/android.git```
40+
* Make official OpenCloud repo known as upstream: ```git remote add upstream https://github.com/opencloud-eu/android.git```
4141
* Make sure to get and apply the latest changes from official android/master branch: ```git fetch upstream``` + ```git rebase upstream/master```
4242

4343
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
6969
The generated APK file is saved in android/build/outputs/apk as android-debug.apk
7070

7171

72-
[0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md
72+
[0]: https://github.com/opencloud-eu/android/blob/master/CONTRIBUTING.md
7373
[1]: https://git-scm.com/
7474
[2]: https://git-scm.com/downloads
7575
[3]: https://developer.android.com/sdk/index.html

TROUBLESHOOTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Troubleshooting
22

33
Check the documentation for troubleshooting information:
4-
https://doc.owncloud.com/android/troubleshooting.html
4+
https://docs.opencloud.eu/

issue_template.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
3.
1111

1212

13-
Can this problem be reproduced with the official owncloud server?
14-
(url: https://demo.owncloud.org, user: test, password: test)
13+
Can this problem be reproduced with the official server?
14+
(url: https://demo.opencloud.eu)
1515

1616

1717
### Environment data
@@ -21,17 +21,17 @@ Device model:
2121

2222
Stock or customized system:
2323

24-
ownCloud app version:
24+
Android app version:
2525

26-
ownCloud server version:
26+
Server version:
2727

2828
### Logs
2929
#### Web server error log
3030
```
3131
Insert your webserver log here
3232
```
3333

34-
#### ownCloud log (data/owncloud.log)
34+
#### Server log
3535
```
36-
Insert your ownCloud log here
36+
Insert your OpenCloud server log here
3737
```

owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ class LoginActivityTest {
309309
@Test
310310
fun checkServerInfo_isSuccess_updateUrlInput() {
311311
launchTest()
312-
R.id.hostUrlInput.typeText("demo.owncloud.com")
312+
R.id.hostUrlInput.typeText("demo.opencloud.eu")
313313

314314
serverInfoLiveData.postValue(Event(UIResult.Success(SECURE_SERVER_INFO_BASIC)))
315315

owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,14 +339,14 @@ class SettingsMoreFragmentTest {
339339

340340
@Test
341341
fun imprintOpensUrl() {
342-
every { moreViewModel.getImprintUrl() } returns "https://owncloud.com/mobile"
342+
every { moreViewModel.getImprintUrl() } returns "https://opencloud.eu/mobile"
343343

344344
launchTest()
345345

346346
mockIntent(action = Intent.ACTION_VIEW)
347347

348348
onView(withText(R.string.prefs_imprint)).perform(click())
349-
intended(hasData("https://owncloud.com/mobile"))
349+
intended(hasData("https://opencloud.eu/mobile"))
350350
}
351351

352352
companion object {
@@ -356,7 +356,7 @@ class SettingsMoreFragmentTest {
356356
private const val PREFERENCE_RECOMMEND = "recommend"
357357
private const val PREFERENCE_FEEDBACK = "feedback"
358358
private const val PREFERENCE_IMPRINT = "imprint"
359-
private const val FEEDBACK_MAIL = "mailto:android-app@owncloud.com"
359+
private const val FEEDBACK_MAIL = "mailto:mail@opencloud.eu"
360360

361361
}
362362

owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ fun Activity.openFeedbackDialog() {
355355
val getInContactDescription =
356356
getString(
357357
R.string.feedback_dialog_get_in_contact_description,
358-
DrawerActivity.CENTRAL_URL,
359358
DrawerActivity.GITHUB_URL
360359
).trimIndent()
361360
val spannableString = HtmlCompat.fromHtml(getInContactDescription, HtmlCompat.FROM_HTML_MODE_LEGACY)

owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,7 @@ abstract class DrawerActivity : ToolbarActivity() {
608608
protected abstract fun restart()
609609

610610
companion object {
611-
const val CENTRAL_URL = "https://central.owncloud.org/"
612-
const val GITHUB_URL = "https://github.com/owncloud/android/issues/new/choose"
611+
const val GITHUB_URL = "https://github.com/opencloud-eu/android/issues"
613612
private const val KEY_CHECKED_MENU_ITEM = "CHECKED_MENU_ITEM"
614613
}
615614
}

owncloudApp/src/main/res/values/setup.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<string name="server_url" formatted="false"></string>
2121
<bool name="show_server_url_input">true</bool>
2222
<bool name="show_welcome_link">true</bool>
23-
<string name="welcome_link_url" formatted="false">"https://owncloud.com/docs-guides"</string>
23+
<string name="welcome_link_url" formatted="false">"https://docs.opencloud.eu/"</string>
2424
<string name="share_api_link" formatted="false"></string>
2525
<string name="login_welcome_text" formatted="false"></string>
2626

@@ -71,12 +71,12 @@
7171
<bool name="privacy_policy_enabled">true</bool>
7272
<bool name="wizard_enabled">true</bool>
7373
<bool name="release_notes_enabled">true</bool>
74-
<string name="url_privacy_policy" formatted="false">https://owncloud.com/android-app-privacy-policy/</string>
75-
<string name="url_help" formatted="false">https://doc.owncloud.com/android</string>
74+
<string name="url_privacy_policy" formatted="false">https://opencloud.eu/en/data-protection-notice</string> <!-- FIXME: app specific -->
75+
<string name="url_help" formatted="false">https://docs.opencloud.eu/</string>
7676
<string name="url_imprint" formatted="false"></string>
7777
<string name="mail_recommend" formatted="false">"mailto:"</string>
7878
<string name="mail_feedback" formatted="false"></string>
79-
<string name="url_app_download" formatted="false">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string>
79+
<string name="url_app_download" formatted="false">"https://play.google.com/store/apps/details?id=eu.opencloud.android"</string>
8080
<string name="url_sync_calendar_contacts">"https://play.google.com/store/apps/details?id=at.bitfire.davdroid"</string>
8181
<string name="url_document_provider_app">https://play.google.com/store/apps/details?id=com.marc.files</string>
8282

0 commit comments

Comments
 (0)