Automatic upstream merge postprocessing

Change-Id: Id3446b2b984430aa7f1fd6cba36410ee80a21c4c

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve Element
+about: Create a report to help us improve SchildiChat
 title: ''
 labels: ''
 assignees: ''
@@ -31,4 +31,8 @@ If applicable, add screenshots to help explain your problem.
  - App version and store [e.g. 1.0.0 - F-Droid]
  - Homeserver: [e.g. matrix.org]
 
+**Upstream relevance**
+ - Does this issue exist in Element Android?
+ - If this issue exists in Element Android, please also link the corresponding bug report (create a new one if it doesn't exist yet)
+
 Add any other context about the problem here.

README.md

@@ -1,34 +1,24 @@
-[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
-[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
-[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
-[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+# SchildiChat for Android
 
-# Element Android
+SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android).
 
-Element Android is an Android Matrix Client provided by [Element](https://element.io/).
+Compared to Element, SchildiChat features following most important changes:
 
-It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience.
+- A unified chat list for both direct and group chats
+- Optional message bubbles
+- Further small usability improvements
 
-[<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
-[<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
+A more thorough list of changes compared to Element can be found [here](FEATURES.md).
 
-Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+<a href="https://f-droid.org/packages/de.spiritcroc.riotx/" alt="Get it on F-Droid" target="_blank"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="80"></a>
 
-# New Android SDK
+The version in the official F-Droid repositories comes without the proprietary libraries for push notifications.
+This might lead to increased battery drain and a higher delay for delivering messages.
+If you are looking for a version with push notification support, you can get it from [my F-Droid repository](https://s2.spiritcroc.de/fdroid/repo/).
+The latest version should also be available for direct download [here](https://s2.spiritcroc.de/fdroid/SchildiChat.apk).
 
-Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
+<a href="https://matrix.to/#/#schildichat-android:matrix.org" target="_blank">Join the discussion on matrix</a>
 
-At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
+## Screenshots
 
-# Roadmap
-
-The version 1.0.0 of Element still misses some features which was previously included in Riot-Android.
-The team will work to add them on a regular basis.
-
-## Contributing
-
-Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
-
-Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
+<img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png" height="500"/>

fastlane/metadata/android/en-US/full_description.txt

@@ -1,30 +1,13 @@
-Element is a new type of messenger and collaboration app that:
+SchildiChat is a client for the matrix protocol, based on the Element app.
+Compared to other clients, it provides a more classic instant messenger feel, while still providing the full functionality of the reference client.
 
-1. Puts you in control to preserve your privacy
-2. Lets you communicate with anyone in the Matrix network, and even beyond by integrating with apps such as Slack
-3. Protects you from advertising, datamining and walled gardens
-4. Secures you through end-to-end encryption, with cross-signing to verify others
+The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
 
-Element is completely different from other messaging and collaboration apps because it is decentralised and open source.
+Compared to the Element app, SchildiChat features following changes:
+- A unified chat list for both direct and group chats
+- Optional message bubbles
+- Follows the system setting for dark/light mode
+- Further small usability improvements
 
-Element lets you self-host - or choose a host - so that you have privacy, ownership and control of your data and conversations. It gives you access to an open network; so you’re not just stuck speaking to other Element users only. And it is very secure.
-
-Element is able to do all this because it operates on Matrix - the standard for open, decentralised communication.
-
-Element puts you in control by letting you choose who hosts your conversations. From the Element app, you can choose to host in different ways:
-
-1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
-2. Self-host your account by running a server on your own hardware
-3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
-
-<b>Why choose Element?</b>
-
-<b>OWN YOUR DATA</b>: You decide where to keep your data and messages. You own it and control it, not some MEGACORP that mines your data or gives access to third parties.
-
-<b>OPEN MESSAGING AND COLLABORATION</b>: You can chat with anyone else in the Matrix network, whether they’re using Element or another Matrix app, and even if they are using a different messaging system of the likes of Slack, IRC or XMPP.
-
-<b>SUPER-SECURE</b>: Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signing to verify the devices of conversation participants.
-
-<b>COMPLETE COMMUNICATION</b>: Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
-
-<b>EVERYWHERE YOU ARE</b>: Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io.
+SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
+More information about the Matrix protocol: https://matrix.org/

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-Secure decentralised chat & VoIP. Keep your data safe from third parties.
+Secure messenger for Matrix with a traditional instant messaging experience

fastlane/metadata/android/en-US/title.txt

@@ -1 +1 @@
-Element (previously Riot.im)
+SchildiChat

tmp_sc_README.md

@@ -1,24 +0,0 @@
-# SchildiChat for Android
-
-SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android).
-
-Compared to Element, SchildiChat features following most important changes:
-
-- A unified chat list for both direct and group chats
-- Optional message bubbles
-- Further small usability improvements
-
-A more thorough list of changes compared to Element can be found [here](FEATURES.md).
-
-<a href="https://f-droid.org/packages/de.spiritcroc.riotx/" alt="Get it on F-Droid" target="_blank"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="80"></a>
-
-The version in the official F-Droid repositories comes without the proprietary libraries for push notifications.
-This might lead to increased battery drain and a higher delay for delivering messages.
-If you are looking for a version with push notification support, you can get it from [my F-Droid repository](https://s2.spiritcroc.de/fdroid/repo/).
-The latest version should also be available for direct download [here](https://s2.spiritcroc.de/fdroid/SchildiChat.apk).
-
-<a href="https://matrix.to/#/#schildichat-android:matrix.org" target="_blank">Join the discussion on matrix</a>
-
-## Screenshots
-
-<img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png" height="500"/>

tmp_sc_fastlane/metadata/android/en-US/full_description.txt

@@ -1,13 +0,0 @@
-SchildiChat is a client for the matrix protocol, based on the Element app.
-Compared to other clients, it provides a more classic instant messenger feel, while still providing the full functionality of the reference client.
-
-The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
-
-Compared to the Element app, SchildiChat features following changes:
-- A unified chat list for both direct and group chats
-- Optional message bubbles
-- Follows the system setting for dark/light mode
-- Further small usability improvements
-
-SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
-More information about the Matrix protocol: https://matrix.org/

tmp_sc_fastlane/metadata/android/en-US/short_description.txt

@@ -1 +0,0 @@
-Secure messenger for Matrix with a traditional instant messaging experience

tmp_sc_fastlane/metadata/android/ru-RU/title.txt

@@ -1 +0,0 @@
-SchildiChat

upstream_.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve SchildiChat
+about: Create a report to help us improve Element
 title: ''
 labels: ''
 assignees: ''
@@ -31,8 +31,4 @@ If applicable, add screenshots to help explain your problem.
  - App version and store [e.g. 1.0.0 - F-Droid]
  - Homeserver: [e.g. matrix.org]
 
-**Upstream relevance**
- - Does this issue exist in Element Android?
- - If this issue exists in Element Android, please also link the corresponding bug report (create a new one if it doesn't exist yet)
-
 Add any other context about the problem here.

upstream_README.md

@@ -0,0 +1,34 @@
+[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
+[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+
+# Element Android
+
+Element Android is an Android Matrix Client provided by [Element](https://element.io/).
+
+It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience.
+
+[<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
+[<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
+
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+
+# New Android SDK
+
+Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
+
+At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
+
+# Roadmap
+
+The version 1.0.0 of Element still misses some features which was previously included in Riot-Android.
+The team will work to add them on a regular basis.
+
+## Contributing
+
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+
+Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).