Commit Graph

9677 Commits

Author SHA1 Message Date
Benoit Marty edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields
Cleanup redundant fields - TO BE MERGED ON JULY 1st
2021-07-05 16:16:33 +02:00
Benoit Marty c2e649f64e Fix deprecated method 2021-07-05 16:07:44 +02:00
Benoit Marty b285bd0359 Merge branch 'develop' into feature/bca/room_upgrade 2021-07-05 16:01:27 +02:00
zeritti 084e497463 Translated using Weblate (Czech)
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-07-05 13:34:54 +00:00
Jeff Huang 46320ef71b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-07-05 13:34:54 +00:00
Priit Jõerüüt f35050d4b4 Translated using Weblate (Estonian)
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-07-05 13:34:53 +00:00
sr093906 10e38d3319 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
2021-07-05 13:34:52 +00:00
Szimszon 80d415b242 Translated using Weblate (Hungarian)
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2021-07-05 13:34:52 +00:00
Jeff Huang e0f5099bd6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2021-07-05 13:34:51 +00:00
sr093906 900769174c Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2021-07-05 13:34:51 +00:00
lvre 7ccc218c6b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-07-05 13:34:50 +00:00
Szimszon a610ea06aa Translated using Weblate (Hungarian)
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2021-07-05 13:34:50 +00:00
Priit Jõerüüt 8034ea16e5 Translated using Weblate (Estonian)
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2021-07-05 13:34:50 +00:00
zeritti 5fc818fac2 Translated using Weblate (Czech)
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2021-07-05 13:34:49 +00:00
Benoit Marty c40add88f9
Merge pull request #3617 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.1
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
2021-07-05 14:38:07 +02:00
dependabot[bot] 8639582671
Bump espresso_version from 3.3.0 to 3.4.0
Bumps `espresso_version` from 3.3.0 to 3.4.0.

Updates `espresso-core` from 3.3.0 to 3.4.0

Updates `espresso-contrib` from 3.3.0 to 3.4.0

Updates `espresso-intents` from 3.3.0 to 3.4.0

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 12:38:04 +00:00
Benoit Marty fa370861e8
Merge pull request #3597 from vector-im/dependabot/gradle/com.android.tools.build-gradle-4.2.2
Bump gradle from 4.2.1 to 4.2.2
2021-07-05 14:37:58 +02:00
Benoit Marty 5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0
Bump core-ktx from 1.5.0 to 1.6.0
2021-07-05 14:37:48 +02:00
Benoit Marty 242962f770
Merge pull request #3594 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.12.0
Bump mockk-android from 1.11.0 to 1.12.0
2021-07-05 14:37:33 +02:00
Benoit Marty ca39182665
Merge pull request #3592 from vector-im/dependabot/gradle/io.mockk-mockk-1.12.0
Bump mockk from 1.11.0 to 1.12.0
2021-07-05 14:37:20 +02:00
Benoit Marty f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0
Bump androidxTest_version from 1.3.0 to 1.4.0
2021-07-05 14:37:14 +02:00
Benoit Marty 80b1aa3c01
Merge pull request #3590 from vector-im/dependabot/gradle/androidx.test-orchestrator-1.4.0
Bump orchestrator from 1.3.0 to 1.4.0
2021-07-05 14:37:07 +02:00
Benoit Marty c443cffca5
Merge pull request #3627 from vector-im/gradlew-update-7.1.1
Update Gradle Wrapper from 7.1 to 7.1.1
2021-07-05 14:36:04 +02:00
Benoit Marty 72dcc92032 Version++ 2021-07-05 14:27:33 +02:00
Benoit Marty cf5ab304df Merge branch 'release/1.1.12' into develop 2021-07-05 09:57:56 +02:00
Benoit Marty 9673b3b15b Release: fastlane 2021-07-05 09:56:27 +02:00
Benoit Marty 09e362ec6b Release: towncrier 2021-07-05 09:55:22 +02:00
Benoit Marty 76f4c81d2d Hide password... Oups 2021-07-05 09:50:20 +02:00
lvre eb4f36319f Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-07-03 20:00:21 +00:00
lvre 886ce7ce3b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-07-03 20:00:06 +00:00
Benoit Marty 2d860eaa2a
Merge pull request #3622 from vector-im/feature/bma/crash_realm
CryptoStore migration has to be object to avoid crash
2021-07-03 20:08:57 +02:00
gradle-update-robot 4ad5deac38 Update Gradle Wrapper from 7.1 to 7.1.1.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2021-07-03 00:09:56 +00:00
dependabot[bot] 9ff1e20f07
Bump material from 1.3.0 to 1.4.0
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-02 23:07:53 +00:00
David Baker 78c87870ae changelog 2021-07-02 20:22:14 +01:00
David Baker fe4c4832bd Use different copy for self verification
The copy all refers to 'their' device for when you're verifying
someone else. Update it to refer to your own devices in the case
where you're verifying one of your own devices.
2021-07-02 18:38:57 +01:00
Benoit Marty 2513be744c CryptoStore migration has to be object to avoid crash
Thread: main, Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. The most likely cause is that equals() and hashCode() are not overridden in the migration class: org.matrix.android.sdk.internal.database.RealmSessionStoreMigration
2021-07-02 17:29:44 +02:00
Benoit Marty 2a0230633d
Merge pull request #3620 from vector-im/feature/bma/fix_wl
Fix compilation issue
2021-07-02 17:29:04 +02:00
Benoit Marty 2c7b947d27 Fix compilation issue
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
2021-07-02 15:32:01 +02:00
Benoit Marty f06d2b1734 Fix typo 2021-07-02 14:55:30 +02:00
Benoit Marty 1eea734a4c Fix compilation issue
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
2021-07-02 12:53:00 +02:00
Benoit Marty dc50246ec4
Merge pull request #3618 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-07-02 10:25:45 +02:00
Weblate 64b6779cfa Merge branch 'origin/develop' into Weblate. 2021-07-02 07:52:44 +00:00
Benoit Marty b0f7268d13
Merge pull request #3553 from vector-im/feature/fga/fix_timeline_visibility
Fix some issues with timeline cache invalidation and visibility.
2021-07-02 09:40:37 +02:00
Benoit Marty d4009476f9 Cleanup 2021-07-02 09:39:32 +02:00
Benoit Marty 7dc5d8490f
Merge pull request #3584 from vector-im/feature/bca/fix_oom_spacechild
Fix / dm flattenParents always growing
2021-07-02 09:35:51 +02:00
lvre 1906fbdeaa Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-07-02 01:04:01 +00:00
dependabot[bot] 9430d7a5dd
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.6.0 to 10.6.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.6.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.6.0...v10.6.1)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 23:07:36 +00:00
Valere adcd1a64df empty migration to fix big flattenParentIds for DM 2021-07-01 15:28:26 +02:00
Benoit Marty ef31aad42c Fix copyright 2021-07-01 14:47:04 +02:00
Benoit Marty 47ef0d90fc Open upgraded room when upgrading from the room profile 2021-07-01 14:31:27 +02:00