diff --git a/tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
diff --git a/tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/tmp_sc_.github/workflows/stale.yml b/.github/workflows/stale.yml
similarity index 100%
rename from tmp_sc_.github/workflows/stale.yml
rename to .github/workflows/stale.yml
diff --git a/README.md b/README.md
index 77342f493f..1f9c125017 100644
--- a/README.md
+++ b/README.md
@@ -1,67 +1,25 @@
-[](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop)
-[](https://translate.element.io/engage/element-android/?utm_source=widget)
-[](https://matrix.to/#/#element-android:matrix.org)
-[](https://sonarcloud.io/summary/new_code?id=element-android)
-[](https://sonarcloud.io/summary/new_code?id=element-android)
-[](https://sonarcloud.io/summary/new_code?id=element-android)
+[](https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/)
+[](https://matrix.to/#/#android:schildi.chat)
-# Element Android
+# SchildiChat for Android
-Element Classic Android is a previous-generation [Matrix](https://matrix.org/) client provided by [Element](https://element.io/). The app can be run on every Android devices with Android OS Lollipop and more (API 21). This client is still supported and receives security updates but no new features or usability enhancements are made. It is recommended to use [Element X](https://github.com/element-hq/element-x-android) that is the next-generation mobile app.
+SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android),
+featuring a different design and various extra tweaks, customization options, and additional community features.
+A list of changes compared to Element can be found [here](FEATURES.md) - but keep in mind this list might not be up-to-date at all times.
-[
](https://play.google.com/store/apps/details?id=im.vector.app)
-[
](https://f-droid.org/app/im.vector.app)
+
+
-Build of develop branch: [](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop) Nightly test status: [](https://github.com/element-hq/element-android/actions/workflows/nightly.yml)
+Information about available app variants can be found [on our website](https://schildi.chat/android/).
+Join the discussion on matrix
+Join our matrix community space
-# New Android SDK
+## Translations
-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.
+If you want to translate SchildiChat, visit its weblate [here](https://translate.schildi.chat/projects/schildichat/schildichat-android/).
+For translations that concern upstream Element code, visit their weblate [here](https://translate.element.io/engage/element-android/).
-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.
-
-# Releases to app stores
-
-There is some delay between when a release is created and when it appears in the app stores (Google Play Store and F-Droid). Here are some of the reasons:
-
-* Not all versioned releases that appear on GitHub are considered stable. Each release is first considered beta: this continues for at least two days. If the release is stable (no serious issues or crashes are reported), then it is released as a production release in Google Play Store, and a request is sent to F-Droid too.
-* Each release on the Google Play Store undergoes review by Google before it comes out. This can take an unpredictable amount of time. In some cases it has taken several weeks.
-* In order for F-Droid to guarantee that the app you receive exactly matches the public source code, they build releases themselves. When a release is considered stable, Element staff inform the F-Droid maintainers and it is added to the build queue. Depending on the load on F-Droid's infrastructure, it can take some time for releases to be built. This always takes at least 24 hours, and can take several days.
-
-If you would like to receive releases more quickly (bearing in mind that they may not be stable) you have a number of options:
-
-1. [Sign up to receive beta releases](https://play.google.com/apps/testing/im.vector.app) via the Google Play Store.
-2. Install a [release APK](https://github.com/element-hq/element-android/releases) directly - download the relevant .apk file and allow installing from untrusted sources in your device settings. Note: these releases are the Google Play version, which depend on some Google services. If you prefer to avoid that, try the latest dev builds, and choose the F-Droid version.
-3. If you're really brave, install the [very latest dev build](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop) - pick a build, then click on `Summary` to download the APKs from there: `vector-Fdroid-debug` and `vector-Gplay-debug` contains the APK for the desired store. Each file contains 5 APKs. 4 APKs for every supported specific architecture of device. In doubt you can install the `universal` APK.
-
-## Contributing
-
-Please refer to [CONTRIBUTING.md](./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).
-
-Also [this documentation](./docs/_developer_onboarding.md) can hopefully help developers to start working on the project.
-
-## Triaging issues
-
-Issues are triaged by community members and the Android App Team, following the [triage process](https://github.com/element-hq/element-meta/wiki/Triage-process).
-
-We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.
-
-## Copyright and License
-
-Copyright (c) 2018 - 2025 New Vector Ltd
-
-This software is dual licensed by New Vector Ltd (Element). It can be used either:
-
-(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
-
-(2) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
-
-Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.
+
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 25273b0b09..811e38d972 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,2 +1,2 @@
-json_key_file("./fastlane/private/api-8525453667099313774-565354-aca0e6153603.json")
-package_name("im.vector.app")
+json_key_file("../google-api-fastlane-release.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("de.spiritcroc.riotx") # e.g. com.krausefx.app
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 85e3d777ac..b53db9622a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,45 +16,49 @@
default_platform(:android)
platform :android do
+ keystore = ENV["keystore"]
+ keystore_pass = ENV["keystorepass"]
+ key_alias = ENV["keyalias"]
+ key_pass = ENV["keypass"]
+
desc "Runs all the tests"
lane :test do
gradle(task: "test")
end
- desc "Submit a new Beta Build to Crashlytics Beta"
- lane :beta do
- gradle(task: "clean assembleRelease")
- crashlytics
-
- # sh "your_script.sh"
- # You can also use other beta testing services here
- end
-
- desc "Deploy a new version to the Google Play"
+ desc "Deploy a new version to Google Play"
lane :deploy do
- gradle(task: "clean assembleRelease")
- upload_to_play_store
- end
-
- desc "Deploy Google Play metadata"
- lane :deployMeta do
- # Doc: https://docs.fastlane.tools/actions/upload_to_play_store/
+ gradle(
+ task: "clean bundleGplayRelease",
+ properties: {
+ "android.injected.signing.store.file": keystore,
+ "android.injected.signing.store.password": keystore_pass,
+ "android.injected.signing.key.alias": key_alias,
+ "android.injected.signing.key.password": key_pass
+ }
+ )
upload_to_play_store(
- skip_upload_apk: true,
- skip_upload_aab: true,
- skip_upload_images: true,
- skip_upload_screenshots: true,
- skip_upload_changelogs: true,
- # Set to true to not update the PlayStore
- validate_only: false
+ # apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
)
end
- desc "Get version code"
- lane :getVersionCode do
- versions = google_play_track_version_codes(track: "production")
- puts(versions)
- version_code = versions[0]
- puts(version_code)
+ desc "Deploy a beta to Google Play"
+ lane :deploy_beta do
+ gradle(
+ task: "clean bundleGplayRelease",
+ properties: {
+ "android.injected.signing.store.file": keystore,
+ "android.injected.signing.store.password": keystore_pass,
+ "android.injected.signing.key.alias": key_alias,
+ "android.injected.signing.key.password": key_pass
+ }
+ )
+ upload_to_play_store(
+ # apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
+ track: 'beta',
+ skip_upload_metadata: false,
+ skip_upload_images: true,
+ skip_upload_screenshots: true
+ )
end
end
diff --git a/fastlane/README.md b/fastlane/README.md
index 7fea7afdd5..72d98321b1 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -23,37 +23,21 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
Runs all the tests
-### android beta
-
-```sh
-[bundle exec] fastlane android beta
-```
-
-Submit a new Beta Build to Crashlytics Beta
-
### android deploy
```sh
[bundle exec] fastlane android deploy
```
-Deploy a new version to the Google Play
+Deploy a new version to Google Play
-### android deployMeta
+### android deploy_beta
```sh
-[bundle exec] fastlane android deployMeta
+[bundle exec] fastlane android deploy_beta
```
-Deploy Google Play metadata
-
-### android getVersionCode
-
-```sh
-[bundle exec] fastlane android getVersionCode
-```
-
-Get version code
+Deploy a beta to Google Play
----
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/full_description.txt
rename to fastlane/metadata/android/de-DE/full_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/short_description.txt
rename to fastlane/metadata/android/de-DE/short_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/de-DE/title.txt
rename to fastlane/metadata/android/de-DE/title.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt b/fastlane/metadata/android/en-US/changelogs/40100250.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt
rename to fastlane/metadata/android/en-US/changelogs/40100250.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100270.txt b/fastlane/metadata/android/en-US/changelogs/40100270.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100270.txt
rename to fastlane/metadata/android/en-US/changelogs/40100270.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100290.txt b/fastlane/metadata/android/en-US/changelogs/40100290.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100290.txt
rename to fastlane/metadata/android/en-US/changelogs/40100290.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100300.txt b/fastlane/metadata/android/en-US/changelogs/40100300.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100300.txt
rename to fastlane/metadata/android/en-US/changelogs/40100300.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100310.txt b/fastlane/metadata/android/en-US/changelogs/40100310.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100310.txt
rename to fastlane/metadata/android/en-US/changelogs/40100310.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100330.txt b/fastlane/metadata/android/en-US/changelogs/40100330.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100330.txt
rename to fastlane/metadata/android/en-US/changelogs/40100330.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100340.txt b/fastlane/metadata/android/en-US/changelogs/40100340.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100340.txt
rename to fastlane/metadata/android/en-US/changelogs/40100340.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100350.txt b/fastlane/metadata/android/en-US/changelogs/40100350.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100350.txt
rename to fastlane/metadata/android/en-US/changelogs/40100350.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100360.txt b/fastlane/metadata/android/en-US/changelogs/40100360.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100360.txt
rename to fastlane/metadata/android/en-US/changelogs/40100360.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100370.txt b/fastlane/metadata/android/en-US/changelogs/40100370.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100370.txt
rename to fastlane/metadata/android/en-US/changelogs/40100370.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100390.txt b/fastlane/metadata/android/en-US/changelogs/40100390.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100390.txt
rename to fastlane/metadata/android/en-US/changelogs/40100390.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100410.txt b/fastlane/metadata/android/en-US/changelogs/40100410.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100410.txt
rename to fastlane/metadata/android/en-US/changelogs/40100410.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100420.txt b/fastlane/metadata/android/en-US/changelogs/40100420.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100420.txt
rename to fastlane/metadata/android/en-US/changelogs/40100420.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100430.txt b/fastlane/metadata/android/en-US/changelogs/40100430.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100430.txt
rename to fastlane/metadata/android/en-US/changelogs/40100430.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100440.txt b/fastlane/metadata/android/en-US/changelogs/40100440.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100440.txt
rename to fastlane/metadata/android/en-US/changelogs/40100440.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100450.txt b/fastlane/metadata/android/en-US/changelogs/40100450.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100450.txt
rename to fastlane/metadata/android/en-US/changelogs/40100450.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100470.txt b/fastlane/metadata/android/en-US/changelogs/40100470.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100470.txt
rename to fastlane/metadata/android/en-US/changelogs/40100470.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100480.txt b/fastlane/metadata/android/en-US/changelogs/40100480.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100480.txt
rename to fastlane/metadata/android/en-US/changelogs/40100480.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100500.txt b/fastlane/metadata/android/en-US/changelogs/40100500.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100500.txt
rename to fastlane/metadata/android/en-US/changelogs/40100500.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100510.txt b/fastlane/metadata/android/en-US/changelogs/40100510.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100510.txt
rename to fastlane/metadata/android/en-US/changelogs/40100510.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100530.txt b/fastlane/metadata/android/en-US/changelogs/40100530.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100530.txt
rename to fastlane/metadata/android/en-US/changelogs/40100530.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100560.txt b/fastlane/metadata/android/en-US/changelogs/40100560.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100560.txt
rename to fastlane/metadata/android/en-US/changelogs/40100560.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100580.txt b/fastlane/metadata/android/en-US/changelogs/40100580.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100580.txt
rename to fastlane/metadata/android/en-US/changelogs/40100580.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100590.txt b/fastlane/metadata/android/en-US/changelogs/40100590.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100590.txt
rename to fastlane/metadata/android/en-US/changelogs/40100590.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100620.txt b/fastlane/metadata/android/en-US/changelogs/40100620.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100620.txt
rename to fastlane/metadata/android/en-US/changelogs/40100620.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100630.txt b/fastlane/metadata/android/en-US/changelogs/40100630.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100630.txt
rename to fastlane/metadata/android/en-US/changelogs/40100630.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100640.txt b/fastlane/metadata/android/en-US/changelogs/40100640.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100640.txt
rename to fastlane/metadata/android/en-US/changelogs/40100640.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100650.txt b/fastlane/metadata/android/en-US/changelogs/40100650.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100650.txt
rename to fastlane/metadata/android/en-US/changelogs/40100650.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100660.txt b/fastlane/metadata/android/en-US/changelogs/40100660.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100660.txt
rename to fastlane/metadata/android/en-US/changelogs/40100660.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100680.txt b/fastlane/metadata/android/en-US/changelogs/40100680.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100680.txt
rename to fastlane/metadata/android/en-US/changelogs/40100680.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100700.txt b/fastlane/metadata/android/en-US/changelogs/40100700.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100700.txt
rename to fastlane/metadata/android/en-US/changelogs/40100700.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100720.txt b/fastlane/metadata/android/en-US/changelogs/40100720.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100720.txt
rename to fastlane/metadata/android/en-US/changelogs/40100720.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100750.txt b/fastlane/metadata/android/en-US/changelogs/40100750.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100750.txt
rename to fastlane/metadata/android/en-US/changelogs/40100750.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100770.txt b/fastlane/metadata/android/en-US/changelogs/40100770.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100770.txt
rename to fastlane/metadata/android/en-US/changelogs/40100770.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100780.txt b/fastlane/metadata/android/en-US/changelogs/40100780.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100780.txt
rename to fastlane/metadata/android/en-US/changelogs/40100780.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100810.txt b/fastlane/metadata/android/en-US/changelogs/40100810.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100810.txt
rename to fastlane/metadata/android/en-US/changelogs/40100810.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100820.txt b/fastlane/metadata/android/en-US/changelogs/40100820.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100820.txt
rename to fastlane/metadata/android/en-US/changelogs/40100820.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100840.txt b/fastlane/metadata/android/en-US/changelogs/40100840.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100840.txt
rename to fastlane/metadata/android/en-US/changelogs/40100840.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100860.txt b/fastlane/metadata/android/en-US/changelogs/40100860.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100860.txt
rename to fastlane/metadata/android/en-US/changelogs/40100860.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100880.txt b/fastlane/metadata/android/en-US/changelogs/40100880.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100880.txt
rename to fastlane/metadata/android/en-US/changelogs/40100880.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100890.txt b/fastlane/metadata/android/en-US/changelogs/40100890.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100890.txt
rename to fastlane/metadata/android/en-US/changelogs/40100890.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100900.txt b/fastlane/metadata/android/en-US/changelogs/40100900.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100900.txt
rename to fastlane/metadata/android/en-US/changelogs/40100900.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100910.txt b/fastlane/metadata/android/en-US/changelogs/40100910.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100910.txt
rename to fastlane/metadata/android/en-US/changelogs/40100910.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100930.txt b/fastlane/metadata/android/en-US/changelogs/40100930.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100930.txt
rename to fastlane/metadata/android/en-US/changelogs/40100930.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100940.txt b/fastlane/metadata/android/en-US/changelogs/40100940.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100940.txt
rename to fastlane/metadata/android/en-US/changelogs/40100940.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100960.txt b/fastlane/metadata/android/en-US/changelogs/40100960.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100960.txt
rename to fastlane/metadata/android/en-US/changelogs/40100960.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100990.txt b/fastlane/metadata/android/en-US/changelogs/40100990.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100990.txt
rename to fastlane/metadata/android/en-US/changelogs/40100990.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101030.txt b/fastlane/metadata/android/en-US/changelogs/40101030.txt
index 34089ae8a9..e02c19e0af 100644
--- a/fastlane/metadata/android/en-US/changelogs/40101030.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40101030.txt
@@ -1,2 +1,6 @@
-Main changes in this version: performance improvement and bug fixes!
-Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.3
+- Update codebase to Element v1.5.25
+- Improve reply rendering
+- Themed icon for Material You
+- Add setting to not mention members when clicking on their name
+- Clear composer text when canceling message edits
+- Various bug fixes
diff --git a/fastlane/metadata/android/en-US/changelogs/40101040.txt b/fastlane/metadata/android/en-US/changelogs/40101040.txt
index d1b9ed77b6..df9209ba24 100644
--- a/fastlane/metadata/android/en-US/changelogs/40101040.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40101040.txt
@@ -1,2 +1,5 @@
-Main changes in this version: performance improvement and bug fixes!
-Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.4
+- Update codebase to Element v1.5.26
+- Support webp rendering in the timeline
+- Support image captions in the overview
+- Fix bug rendering the wrong timeline after clicking a broken event link
+- Fixes related to URL preview image rendering
diff --git a/fastlane/metadata/android/en-US/changelogs/40101050.txt b/fastlane/metadata/android/en-US/changelogs/40101050.txt
index fc935a23ef..3bf03ea502 100644
--- a/fastlane/metadata/android/en-US/changelogs/40101050.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40101050.txt
@@ -1,2 +1,6 @@
-Main changes in this version: hot fixes for 1.1.4
-Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.5
+- Update codebase to Element v1.5.28
+- Escape @room in sent reply fallbacks to avoid unintentional pings in other clients
+- Support custom emote packs with state keys
+- Render emote pack names in autocompletion
+- Possibility to expand emote pack suggestions in autocompletion
+- Possibly fix bug with disappearing read receipts
diff --git a/fastlane/metadata/android/en-US/changelogs/40101060.txt b/fastlane/metadata/android/en-US/changelogs/40101060.txt
index d34c20f150..bc1883edac 100644
--- a/fastlane/metadata/android/en-US/changelogs/40101060.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40101060.txt
@@ -1,2 +1,7 @@
-Main changes in this version: hot fixes for 1.1.5
-Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.6
+- Update codebase to Element v1.5.30
+- Button to send supported custom emotes as sticker when entered as only content in the message composer
+- Fix sticker style in threads
+- Show sticker body instead of "Sticker" text in room previews
+- Move custom emojis below standard emojis in autocompletion
+- Fix possible crash when rendering certain formatted messages
+- Another attempt to fix all cases of wrong read receipt locations
diff --git a/fastlane/metadata/android/en-US/changelogs/40101070.txt b/fastlane/metadata/android/en-US/changelogs/40101070.txt
index 75d4b6d4d3..7726400e5f 100644
--- a/fastlane/metadata/android/en-US/changelogs/40101070.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40101070.txt
@@ -1,2 +1,4 @@
-Main changes in this version: beta support for Spaces. Compress video before sending.
-Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.7
+- Update codebase to Element v1.5.32
+- Fix crash for protected access settings
+- Do not ellipsize message previews because of a single trailing newline
+- Fix long freeform reactions hiding sender and timestamp from reaction info
diff --git a/fastlane/metadata/android/en-US/changelogs/40101080.txt b/fastlane/metadata/android/en-US/changelogs/40101080.txt
index 13e7515b35..83c7834fa3 100644
--- a/fastlane/metadata/android/en-US/changelogs/40101080.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40101080.txt
@@ -1,2 +1,5 @@
-Main changes in this version: improvement for Spaces.
-Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.8
+- Render MSC2530 captions in notifications
+- Labs setting to clear highlighted message on scroll
+- Adjust fallback height for sent custom emotes to match MSC2545
+- Fix possible crash from emoji-autocompletion
+- Fix crash when rendering live location on Android < 7
diff --git a/fastlane/metadata/android/en-US/changelogs/40101090.txt b/fastlane/metadata/android/en-US/changelogs/40101090.txt
index 5f51e33791..e580c7d68d 100644
--- a/fastlane/metadata/android/en-US/changelogs/40101090.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40101090.txt
@@ -1,2 +1 @@
-Main changes in this version: add support for gitter.im network.
-Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.9
+- Update codebase to Element v1.6.3
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101200.txt b/fastlane/metadata/android/en-US/changelogs/40101200.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101200.txt
rename to fastlane/metadata/android/en-US/changelogs/40101200.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101210.txt b/fastlane/metadata/android/en-US/changelogs/40101210.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101210.txt
rename to fastlane/metadata/android/en-US/changelogs/40101210.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101220.txt b/fastlane/metadata/android/en-US/changelogs/40101220.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101220.txt
rename to fastlane/metadata/android/en-US/changelogs/40101220.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101230.txt b/fastlane/metadata/android/en-US/changelogs/40101230.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101230.txt
rename to fastlane/metadata/android/en-US/changelogs/40101230.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101240.txt b/fastlane/metadata/android/en-US/changelogs/40101240.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101240.txt
rename to fastlane/metadata/android/en-US/changelogs/40101240.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101250.txt b/fastlane/metadata/android/en-US/changelogs/40101250.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101250.txt
rename to fastlane/metadata/android/en-US/changelogs/40101250.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101260.txt b/fastlane/metadata/android/en-US/changelogs/40101260.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101260.txt
rename to fastlane/metadata/android/en-US/changelogs/40101260.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101270.txt b/fastlane/metadata/android/en-US/changelogs/40101270.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101270.txt
rename to fastlane/metadata/android/en-US/changelogs/40101270.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101280.txt b/fastlane/metadata/android/en-US/changelogs/40101280.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101280.txt
rename to fastlane/metadata/android/en-US/changelogs/40101280.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101290.txt b/fastlane/metadata/android/en-US/changelogs/40101290.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101290.txt
rename to fastlane/metadata/android/en-US/changelogs/40101290.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101300.txt b/fastlane/metadata/android/en-US/changelogs/40101300.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101300.txt
rename to fastlane/metadata/android/en-US/changelogs/40101300.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101310.txt b/fastlane/metadata/android/en-US/changelogs/40101310.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101310.txt
rename to fastlane/metadata/android/en-US/changelogs/40101310.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101320.txt b/fastlane/metadata/android/en-US/changelogs/40101320.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101320.txt
rename to fastlane/metadata/android/en-US/changelogs/40101320.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101330.txt b/fastlane/metadata/android/en-US/changelogs/40101330.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101330.txt
rename to fastlane/metadata/android/en-US/changelogs/40101330.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101340.txt b/fastlane/metadata/android/en-US/changelogs/40101340.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101340.txt
rename to fastlane/metadata/android/en-US/changelogs/40101340.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101350.txt b/fastlane/metadata/android/en-US/changelogs/40101350.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101350.txt
rename to fastlane/metadata/android/en-US/changelogs/40101350.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101360.txt b/fastlane/metadata/android/en-US/changelogs/40101360.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101360.txt
rename to fastlane/metadata/android/en-US/changelogs/40101360.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101370.txt b/fastlane/metadata/android/en-US/changelogs/40101370.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101370.txt
rename to fastlane/metadata/android/en-US/changelogs/40101370.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101380.txt b/fastlane/metadata/android/en-US/changelogs/40101380.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101380.txt
rename to fastlane/metadata/android/en-US/changelogs/40101380.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101390.txt b/fastlane/metadata/android/en-US/changelogs/40101390.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40101390.txt
rename to fastlane/metadata/android/en-US/changelogs/40101390.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40106360.txt b/fastlane/metadata/android/en-US/changelogs/40106360.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40106360.txt
rename to fastlane/metadata/android/en-US/changelogs/40106360.txt
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 843a529b0f..29053ac648 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1 +1,7 @@
-Element Classic is the previous-generation of Element mobile app. Friends, family and communities should use the free and open source Element X app which is faster, easier to use, and more powerful. New users of public sector organisations, enterprises and professional teams users should use the Element Pro app that is built for work and organisations. Element Classic is available at least until the end of 2025 and will receive critical security updates but no further enhancements or new features.
+SchildiChat is a client for the matrix protocol, based on the Element app.
+The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
+By building on Element, SchildiChat inherits all features of one of the most complete and feature-rich Matrix-clients currently available.
+On top, SchildiChat adds a different design and various extra tweaks, customization options, and additional community features.
+
+SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
+More information about the Matrix protocol: https://matrix.org/
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index 97f45aafd3..b542675689 100644
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
index e449d60ca9..5bc83ec826 100644
Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index cf6e59c12d..6d53ec5b6f 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Previous generation Element
+Feature-rich messenger for Matrix based on Element with some extras and tweaks
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
index 07f824539f..e5e6b4db47 100644
--- a/fastlane/metadata/android/en-US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-Element Classic
+SchildiChat
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt b/fastlane/metadata/android/ru-RU/changelogs/40100250.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100250.txt
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt
rename to fastlane/metadata/android/ru-RU/full_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt
rename to fastlane/metadata/android/ru-RU/short_description.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/ru-RU/title.txt
similarity index 100%
rename from tmp_sc_fastlane/metadata/android/en-US/title.txt
rename to fastlane/metadata/android/ru-RU/title.txt
diff --git a/tmp_sc_README.md b/tmp_sc_README.md
deleted file mode 100644
index 1f9c125017..0000000000
--- a/tmp_sc_README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-[](https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/)
-[](https://matrix.to/#/#android:schildi.chat)
-
-# SchildiChat for Android
-
-SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android),
-featuring a different design and various extra tweaks, customization options, and additional community features.
-A list of changes compared to Element can be found [here](FEATURES.md) - but keep in mind this list might not be up-to-date at all times.
-
-
-
-
-Information about available app variants can be found [on our website](https://schildi.chat/android/).
-
-Join the discussion on matrix
-Join our matrix community space
-
-## Translations
-
-If you want to translate SchildiChat, visit its weblate [here](https://translate.schildi.chat/projects/schildichat/schildichat-android/).
-For translations that concern upstream Element code, visit their weblate [here](https://translate.element.io/engage/element-android/).
-
-## Screenshots
-
-
diff --git a/tmp_sc_fastlane/Appfile b/tmp_sc_fastlane/Appfile
deleted file mode 100644
index 811e38d972..0000000000
--- a/tmp_sc_fastlane/Appfile
+++ /dev/null
@@ -1,2 +0,0 @@
-json_key_file("../google-api-fastlane-release.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name("de.spiritcroc.riotx") # e.g. com.krausefx.app
diff --git a/tmp_sc_fastlane/Fastfile b/tmp_sc_fastlane/Fastfile
deleted file mode 100644
index b53db9622a..0000000000
--- a/tmp_sc_fastlane/Fastfile
+++ /dev/null
@@ -1,64 +0,0 @@
-# This file contains the fastlane.tools configuration
-# You can find the documentation at https://docs.fastlane.tools
-#
-# For a list of all available actions, check out
-#
-# https://docs.fastlane.tools/actions
-#
-# For a list of all available plugins, check out
-#
-# https://docs.fastlane.tools/plugins/available-plugins
-#
-
-# Uncomment the line if you want fastlane to automatically update itself
-# update_fastlane
-
-default_platform(:android)
-
-platform :android do
- keystore = ENV["keystore"]
- keystore_pass = ENV["keystorepass"]
- key_alias = ENV["keyalias"]
- key_pass = ENV["keypass"]
-
- desc "Runs all the tests"
- lane :test do
- gradle(task: "test")
- end
-
- desc "Deploy a new version to Google Play"
- lane :deploy do
- gradle(
- task: "clean bundleGplayRelease",
- properties: {
- "android.injected.signing.store.file": keystore,
- "android.injected.signing.store.password": keystore_pass,
- "android.injected.signing.key.alias": key_alias,
- "android.injected.signing.key.password": key_pass
- }
- )
- upload_to_play_store(
- # apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
- )
- end
-
- desc "Deploy a beta to Google Play"
- lane :deploy_beta do
- gradle(
- task: "clean bundleGplayRelease",
- properties: {
- "android.injected.signing.store.file": keystore,
- "android.injected.signing.store.password": keystore_pass,
- "android.injected.signing.key.alias": key_alias,
- "android.injected.signing.key.password": key_pass
- }
- )
- upload_to_play_store(
- # apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
- track: 'beta',
- skip_upload_metadata: false,
- skip_upload_images: true,
- skip_upload_screenshots: true
- )
- end
-end
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101030.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101030.txt
deleted file mode 100644
index e02c19e0af..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101030.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Update codebase to Element v1.5.25
-- Improve reply rendering
-- Themed icon for Material You
-- Add setting to not mention members when clicking on their name
-- Clear composer text when canceling message edits
-- Various bug fixes
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101040.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101040.txt
deleted file mode 100644
index df9209ba24..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101040.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Update codebase to Element v1.5.26
-- Support webp rendering in the timeline
-- Support image captions in the overview
-- Fix bug rendering the wrong timeline after clicking a broken event link
-- Fixes related to URL preview image rendering
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101050.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101050.txt
deleted file mode 100644
index 3bf03ea502..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101050.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Update codebase to Element v1.5.28
-- Escape @room in sent reply fallbacks to avoid unintentional pings in other clients
-- Support custom emote packs with state keys
-- Render emote pack names in autocompletion
-- Possibility to expand emote pack suggestions in autocompletion
-- Possibly fix bug with disappearing read receipts
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101060.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101060.txt
deleted file mode 100644
index bc1883edac..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101060.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-- Update codebase to Element v1.5.30
-- Button to send supported custom emotes as sticker when entered as only content in the message composer
-- Fix sticker style in threads
-- Show sticker body instead of "Sticker" text in room previews
-- Move custom emojis below standard emojis in autocompletion
-- Fix possible crash when rendering certain formatted messages
-- Another attempt to fix all cases of wrong read receipt locations
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101070.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101070.txt
deleted file mode 100644
index 7726400e5f..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101070.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Update codebase to Element v1.5.32
-- Fix crash for protected access settings
-- Do not ellipsize message previews because of a single trailing newline
-- Fix long freeform reactions hiding sender and timestamp from reaction info
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101080.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101080.txt
deleted file mode 100644
index 83c7834fa3..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101080.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-- Render MSC2530 captions in notifications
-- Labs setting to clear highlighted message on scroll
-- Adjust fallback height for sent custom emotes to match MSC2545
-- Fix possible crash from emoji-autocompletion
-- Fix crash when rendering live location on Android < 7
diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101090.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101090.txt
deleted file mode 100644
index e580c7d68d..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40101090.txt
+++ /dev/null
@@ -1 +0,0 @@
-- Update codebase to Element v1.6.3
diff --git a/tmp_sc_fastlane/metadata/android/en-US/full_description.txt b/tmp_sc_fastlane/metadata/android/en-US/full_description.txt
deleted file mode 100644
index 29053ac648..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/full_description.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-SchildiChat is a client for the matrix protocol, based on the Element app.
-The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
-By building on Element, SchildiChat inherits all features of one of the most complete and feature-rich Matrix-clients currently available.
-On top, SchildiChat adds a different design and various extra tweaks, customization options, and additional community features.
-
-SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
-More information about the Matrix protocol: https://matrix.org/
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png b/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png
deleted file mode 100644
index b542675689..0000000000
Binary files a/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png and /dev/null differ
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/icon.png b/tmp_sc_fastlane/metadata/android/en-US/images/icon.png
deleted file mode 100644
index 5bc83ec826..0000000000
Binary files a/tmp_sc_fastlane/metadata/android/en-US/images/icon.png and /dev/null differ
diff --git a/tmp_sc_fastlane/metadata/android/en-US/short_description.txt b/tmp_sc_fastlane/metadata/android/en-US/short_description.txt
deleted file mode 100644
index 6d53ec5b6f..0000000000
--- a/tmp_sc_fastlane/metadata/android/en-US/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Feature-rich messenger for Matrix based on Element with some extras and tweaks
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/title.txt b/tmp_sc_fastlane/metadata/android/ru-RU/title.txt
deleted file mode 100644
index e5e6b4db47..0000000000
--- a/tmp_sc_fastlane/metadata/android/ru-RU/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-SchildiChat
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/upstream_.github/ISSUE_TEMPLATE/bug.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug.yml
rename to upstream_.github/ISSUE_TEMPLATE/bug.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/upstream_.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/config.yml
rename to upstream_.github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/ISSUE_TEMPLATE/matrix-sdk.yml b/upstream_.github/ISSUE_TEMPLATE/matrix-sdk.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/matrix-sdk.yml
rename to upstream_.github/ISSUE_TEMPLATE/matrix-sdk.yml
diff --git a/.github/ISSUE_TEMPLATE/release.yml b/upstream_.github/ISSUE_TEMPLATE/release.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/release.yml
rename to upstream_.github/ISSUE_TEMPLATE/release.yml
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/upstream_.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to upstream_.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/dependabot.yml b/upstream_.github/dependabot.yml
similarity index 100%
rename from .github/dependabot.yml
rename to upstream_.github/dependabot.yml
diff --git a/.github/workflows/build.yml b/upstream_.github/workflows/build.yml
similarity index 100%
rename from .github/workflows/build.yml
rename to upstream_.github/workflows/build.yml
diff --git a/.github/workflows/danger.yml b/upstream_.github/workflows/danger.yml
similarity index 100%
rename from .github/workflows/danger.yml
rename to upstream_.github/workflows/danger.yml
diff --git a/.github/workflows/docs.yml b/upstream_.github/workflows/docs.yml
similarity index 100%
rename from .github/workflows/docs.yml
rename to upstream_.github/workflows/docs.yml
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/upstream_.github/workflows/gradle-wrapper-validation.yml
similarity index 100%
rename from .github/workflows/gradle-wrapper-validation.yml
rename to upstream_.github/workflows/gradle-wrapper-validation.yml
diff --git a/.github/workflows/nightly.yml b/upstream_.github/workflows/nightly.yml
similarity index 100%
rename from .github/workflows/nightly.yml
rename to upstream_.github/workflows/nightly.yml
diff --git a/.github/workflows/post-pr.yml b/upstream_.github/workflows/post-pr.yml
similarity index 100%
rename from .github/workflows/post-pr.yml
rename to upstream_.github/workflows/post-pr.yml
diff --git a/.github/workflows/quality.yml b/upstream_.github/workflows/quality.yml
similarity index 100%
rename from .github/workflows/quality.yml
rename to upstream_.github/workflows/quality.yml
diff --git a/.github/workflows/sync-from-external-sources.yml b/upstream_.github/workflows/sync-from-external-sources.yml
similarity index 100%
rename from .github/workflows/sync-from-external-sources.yml
rename to upstream_.github/workflows/sync-from-external-sources.yml
diff --git a/.github/workflows/tests.yml b/upstream_.github/workflows/tests.yml
similarity index 100%
rename from .github/workflows/tests.yml
rename to upstream_.github/workflows/tests.yml
diff --git a/.github/workflows/triage-labelled.yml b/upstream_.github/workflows/triage-labelled.yml
similarity index 100%
rename from .github/workflows/triage-labelled.yml
rename to upstream_.github/workflows/triage-labelled.yml
diff --git a/.github/workflows/triage-move-review-requests.yml b/upstream_.github/workflows/triage-move-review-requests.yml
similarity index 100%
rename from .github/workflows/triage-move-review-requests.yml
rename to upstream_.github/workflows/triage-move-review-requests.yml
diff --git a/.github/workflows/triage-priority-bugs.yml b/upstream_.github/workflows/triage-priority-bugs.yml
similarity index 100%
rename from .github/workflows/triage-priority-bugs.yml
rename to upstream_.github/workflows/triage-priority-bugs.yml
diff --git a/.github/workflows/update-gradle-wrapper.yml b/upstream_.github/workflows/update-gradle-wrapper.yml
similarity index 100%
rename from .github/workflows/update-gradle-wrapper.yml
rename to upstream_.github/workflows/update-gradle-wrapper.yml
diff --git a/.github/workflows/validate-lfs.yml b/upstream_.github/workflows/validate-lfs.yml
similarity index 100%
rename from .github/workflows/validate-lfs.yml
rename to upstream_.github/workflows/validate-lfs.yml
diff --git a/upstream_README.md b/upstream_README.md
new file mode 100644
index 0000000000..77342f493f
--- /dev/null
+++ b/upstream_README.md
@@ -0,0 +1,67 @@
+[](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop)
+[](https://translate.element.io/engage/element-android/?utm_source=widget)
+[](https://matrix.to/#/#element-android:matrix.org)
+[](https://sonarcloud.io/summary/new_code?id=element-android)
+[](https://sonarcloud.io/summary/new_code?id=element-android)
+[](https://sonarcloud.io/summary/new_code?id=element-android)
+
+# Element Android
+
+Element Classic Android is a previous-generation [Matrix](https://matrix.org/) client provided by [Element](https://element.io/). The app can be run on every Android devices with Android OS Lollipop and more (API 21). This client is still supported and receives security updates but no new features or usability enhancements are made. It is recommended to use [Element X](https://github.com/element-hq/element-x-android) that is the next-generation mobile app.
+
+[
](https://play.google.com/store/apps/details?id=im.vector.app)
+[
](https://f-droid.org/app/im.vector.app)
+
+Build of develop branch: [](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop) Nightly test status: [](https://github.com/element-hq/element-android/actions/workflows/nightly.yml)
+
+
+# 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.
+
+# Releases to app stores
+
+There is some delay between when a release is created and when it appears in the app stores (Google Play Store and F-Droid). Here are some of the reasons:
+
+* Not all versioned releases that appear on GitHub are considered stable. Each release is first considered beta: this continues for at least two days. If the release is stable (no serious issues or crashes are reported), then it is released as a production release in Google Play Store, and a request is sent to F-Droid too.
+* Each release on the Google Play Store undergoes review by Google before it comes out. This can take an unpredictable amount of time. In some cases it has taken several weeks.
+* In order for F-Droid to guarantee that the app you receive exactly matches the public source code, they build releases themselves. When a release is considered stable, Element staff inform the F-Droid maintainers and it is added to the build queue. Depending on the load on F-Droid's infrastructure, it can take some time for releases to be built. This always takes at least 24 hours, and can take several days.
+
+If you would like to receive releases more quickly (bearing in mind that they may not be stable) you have a number of options:
+
+1. [Sign up to receive beta releases](https://play.google.com/apps/testing/im.vector.app) via the Google Play Store.
+2. Install a [release APK](https://github.com/element-hq/element-android/releases) directly - download the relevant .apk file and allow installing from untrusted sources in your device settings. Note: these releases are the Google Play version, which depend on some Google services. If you prefer to avoid that, try the latest dev builds, and choose the F-Droid version.
+3. If you're really brave, install the [very latest dev build](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop) - pick a build, then click on `Summary` to download the APKs from there: `vector-Fdroid-debug` and `vector-Gplay-debug` contains the APK for the desired store. Each file contains 5 APKs. 4 APKs for every supported specific architecture of device. In doubt you can install the `universal` APK.
+
+## Contributing
+
+Please refer to [CONTRIBUTING.md](./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).
+
+Also [this documentation](./docs/_developer_onboarding.md) can hopefully help developers to start working on the project.
+
+## Triaging issues
+
+Issues are triaged by community members and the Android App Team, following the [triage process](https://github.com/element-hq/element-meta/wiki/Triage-process).
+
+We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.
+
+## Copyright and License
+
+Copyright (c) 2018 - 2025 New Vector Ltd
+
+This software is dual licensed by New Vector Ltd (Element). It can be used either:
+
+(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
+
+(2) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
+
+Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.
diff --git a/upstream_fastlane/Appfile b/upstream_fastlane/Appfile
new file mode 100644
index 0000000000..25273b0b09
--- /dev/null
+++ b/upstream_fastlane/Appfile
@@ -0,0 +1,2 @@
+json_key_file("./fastlane/private/api-8525453667099313774-565354-aca0e6153603.json")
+package_name("im.vector.app")
diff --git a/upstream_fastlane/Fastfile b/upstream_fastlane/Fastfile
new file mode 100644
index 0000000000..85e3d777ac
--- /dev/null
+++ b/upstream_fastlane/Fastfile
@@ -0,0 +1,60 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+# https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+# https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+ desc "Runs all the tests"
+ lane :test do
+ gradle(task: "test")
+ end
+
+ desc "Submit a new Beta Build to Crashlytics Beta"
+ lane :beta do
+ gradle(task: "clean assembleRelease")
+ crashlytics
+
+ # sh "your_script.sh"
+ # You can also use other beta testing services here
+ end
+
+ desc "Deploy a new version to the Google Play"
+ lane :deploy do
+ gradle(task: "clean assembleRelease")
+ upload_to_play_store
+ end
+
+ desc "Deploy Google Play metadata"
+ lane :deployMeta do
+ # Doc: https://docs.fastlane.tools/actions/upload_to_play_store/
+ upload_to_play_store(
+ skip_upload_apk: true,
+ skip_upload_aab: true,
+ skip_upload_images: true,
+ skip_upload_screenshots: true,
+ skip_upload_changelogs: true,
+ # Set to true to not update the PlayStore
+ validate_only: false
+ )
+ end
+
+ desc "Get version code"
+ lane :getVersionCode do
+ versions = google_play_track_version_codes(track: "production")
+ puts(versions)
+ version_code = versions[0]
+ puts(version_code)
+ end
+end
diff --git a/tmp_sc_fastlane/README.md b/upstream_fastlane/README.md
similarity index 69%
rename from tmp_sc_fastlane/README.md
rename to upstream_fastlane/README.md
index 72d98321b1..7fea7afdd5 100644
--- a/tmp_sc_fastlane/README.md
+++ b/upstream_fastlane/README.md
@@ -23,21 +23,37 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
Runs all the tests
+### android beta
+
+```sh
+[bundle exec] fastlane android beta
+```
+
+Submit a new Beta Build to Crashlytics Beta
+
### android deploy
```sh
[bundle exec] fastlane android deploy
```
-Deploy a new version to Google Play
+Deploy a new version to the Google Play
-### android deploy_beta
+### android deployMeta
```sh
-[bundle exec] fastlane android deploy_beta
+[bundle exec] fastlane android deployMeta
```
-Deploy a beta to Google Play
+Deploy Google Play metadata
+
+### android getVersionCode
+
+```sh
+[bundle exec] fastlane android getVersionCode
+```
+
+Get version code
----
diff --git a/fastlane/metadata/android/en-US/changelogs/40100100.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100100.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100110.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100110.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100120.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100120.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100130.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100130.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100140.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100140.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100150.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100150.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100160.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100160.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100170.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100170.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101000.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101000.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101010.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101010.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101010.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101010.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101020.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101020.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101020.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101030.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101030.txt
new file mode 100644
index 0000000000..34089ae8a9
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Main changes in this version: performance improvement and bug fixes!
+Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.3
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101040.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101040.txt
new file mode 100644
index 0000000000..d1b9ed77b6
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: performance improvement and bug fixes!
+Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.4
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101050.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101050.txt
new file mode 100644
index 0000000000..fc935a23ef
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Main changes in this version: hot fixes for 1.1.4
+Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.5
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101060.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101060.txt
new file mode 100644
index 0000000000..d34c20f150
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Main changes in this version: hot fixes for 1.1.5
+Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.6
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101070.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101070.txt
new file mode 100644
index 0000000000..75d4b6d4d3
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+Main changes in this version: beta support for Spaces. Compress video before sending.
+Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.7
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101080.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101080.txt
new file mode 100644
index 0000000000..13e7515b35
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/changelogs/40101080.txt
@@ -0,0 +1,2 @@
+Main changes in this version: improvement for Spaces.
+Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.8
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101090.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101090.txt
new file mode 100644
index 0000000000..5f51e33791
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/changelogs/40101090.txt
@@ -0,0 +1,2 @@
+Main changes in this version: add support for gitter.im network.
+Full changelog: https://github.com/element-hq/element-android/releases/tag/v1.1.9
diff --git a/fastlane/metadata/android/en-US/changelogs/40101100.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101100.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101100.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101100.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101110.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101110.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101110.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101110.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101120.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101120.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101120.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101120.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101130.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101130.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101130.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101130.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101140.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101140.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101140.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101140.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101150.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101150.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101150.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101150.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40101160.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40101160.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40101160.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40101160.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40102000.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40102000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40102000.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40102000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40102010.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40102010.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40102010.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40102010.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103000.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103000.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103010.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103010.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103010.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103010.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103020.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103020.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103020.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103020.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103030.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103030.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103030.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103030.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103040.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103040.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103040.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103040.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103050.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103050.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103050.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103050.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103060.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103060.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103060.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103060.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103070.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103070.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103070.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103070.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103080.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103080.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103080.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103080.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103090.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103090.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103090.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103090.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103100.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103100.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103100.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103100.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103110.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103110.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103110.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103110.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103120.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103120.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103120.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103120.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103130.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103130.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103130.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103130.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103140.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103140.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103140.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103140.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103150.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103150.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103150.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103150.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103160.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103160.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103160.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103160.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103170.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103170.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103170.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103170.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40103180.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40103180.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40103180.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40103180.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104000.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104000.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104020.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104020.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104020.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104020.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104040.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104040.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104040.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104040.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104060.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104060.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104060.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104060.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104070.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104070.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104070.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104070.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104080.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104080.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104080.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104080.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104100.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104100.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104100.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104100.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104110.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104110.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104110.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104110.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104120.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104120.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104120.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104120.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104130.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104130.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104130.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104130.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104140.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104140.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104140.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104140.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104160.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104160.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104160.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104160.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104180.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104180.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104180.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104180.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104190.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104190.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104190.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104190.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104200.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104200.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104200.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104200.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104220.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104220.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104220.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104220.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104230.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104230.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104230.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104230.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104240.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104240.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104240.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104240.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104250.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104250.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104250.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104250.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104260.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104260.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104260.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104260.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104270.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104270.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104270.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104270.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104280.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104280.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104280.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104280.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104300.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104300.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104300.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104300.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104310.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104310.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104310.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104310.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104320.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104320.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104320.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104320.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104340.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104340.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104340.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104340.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40104360.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40104360.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40104360.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40104360.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105000.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105000.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105020.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105020.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105020.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105020.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105040.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105040.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105040.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105040.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105060.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105060.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105060.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105060.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105070.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105070.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105070.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105070.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105080.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105080.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105080.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105080.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105100.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105100.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105100.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105100.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105110.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105110.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105110.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105110.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105120.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105120.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105120.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105120.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105130.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105130.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105130.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105130.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105140.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105140.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105140.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105140.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105160.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105160.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105160.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105160.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105180.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105180.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105180.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105180.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105200.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105200.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105200.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105200.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105220.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105220.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105220.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105220.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105240.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105240.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105240.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105240.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105250.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105250.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105250.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105250.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105260.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105260.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105260.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105260.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105280.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105280.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105280.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105280.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105300.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105300.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105300.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105300.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40105320.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40105320.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40105320.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40105320.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106000.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106000.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106010.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106010.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106010.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106010.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106020.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106020.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106020.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106020.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106030.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106030.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106030.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106030.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106050.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106050.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106050.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106050.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106060.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106060.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106060.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106060.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106080.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106080.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106080.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106080.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106100.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106100.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106100.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106100.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106120.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106120.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106120.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106120.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106140.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106140.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106140.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106140.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106160.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106160.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106160.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106160.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106180.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106180.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106180.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106180.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106200.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106200.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106200.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106200.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106220.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106220.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106220.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106220.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106240.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106240.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106240.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106240.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106260.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106260.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106260.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106260.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106280.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106280.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106280.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106280.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106300.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106300.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106300.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106300.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106320.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106320.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106320.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106320.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106340.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106340.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106340.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106340.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106380.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106380.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106380.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106380.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106400.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106400.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106400.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106400.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106420.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106420.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106420.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106420.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106440.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106440.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106440.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106440.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106460.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106460.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106460.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106460.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40106480.txt b/upstream_fastlane/metadata/android/en-US/changelogs/40106480.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40106480.txt
rename to upstream_fastlane/metadata/android/en-US/changelogs/40106480.txt
diff --git a/upstream_fastlane/metadata/android/en-US/full_description.txt b/upstream_fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 0000000000..843a529b0f
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1 @@
+Element Classic is the previous-generation of Element mobile app. Friends, family and communities should use the free and open source Element X app which is faster, easier to use, and more powerful. New users of public sector organisations, enterprises and professional teams users should use the Element Pro app that is built for work and organisations. Element Classic is available at least until the end of 2025 and will receive critical security updates but no further enhancements or new features.
diff --git a/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png b/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png
new file mode 100644
index 0000000000..97f45aafd3
Binary files /dev/null and b/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/upstream_fastlane/metadata/android/en-US/images/icon.png b/upstream_fastlane/metadata/android/en-US/images/icon.png
new file mode 100644
index 0000000000..e449d60ca9
Binary files /dev/null and b/upstream_fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
rename to upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
diff --git a/upstream_fastlane/metadata/android/en-US/short_description.txt b/upstream_fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 0000000000..cf6e59c12d
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Previous generation Element
diff --git a/upstream_fastlane/metadata/android/en-US/title.txt b/upstream_fastlane/metadata/android/en-US/title.txt
new file mode 100644
index 0000000000..07f824539f
--- /dev/null
+++ b/upstream_fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+Element Classic
diff --git a/tmp_sc_fastlane/report.xml b/upstream_fastlane/report.xml
similarity index 82%
rename from tmp_sc_fastlane/report.xml
rename to upstream_fastlane/report.xml
index a0a8066b85..4e5b49101b 100644
--- a/tmp_sc_fastlane/report.xml
+++ b/upstream_fastlane/report.xml
@@ -5,17 +5,17 @@
-
+
-
+
-
+