Commit graph

16643 commits

Author SHA1 Message Date
Adam Brown
8ada26529a updating version for 1.4.24 hotfix
- is a hotfix for 1.4.22
2022-06-22 12:37:17 +01:00
Benoit Marty
a525ede25d Fix migration to 30. Seems that isNull with long path is not working correctly. 2022-06-22 11:50:43 +01:00
Adam Brown
9ddded4996 generating 1.4.23 changelog 2022-06-21 14:56:33 +01:00
Adam Brown
f56703abc4 updating version for hotfix release 2022-06-21 14:48:14 +01:00
ganfra
0f29f7848b Feature/fga/simplify timeline logic (#6318)
* Sync: delete all previous chunks in case of gappy sync

* Chunk: dont link chunks if we find existing timeline event (keep multiple timeline events in db)

* Timeline : remove some unused code

* Clean and add changelog

* Timeline: set named argument

* Timeline: avoid restarting the timeline when there is a CancellationException due to permalink

* Timeline: add migration to clean up old (broken) chunks

* Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt

Co-authored-by: Benoit Marty <benoitm@matrix.org>

* Timeline: try to fix test

* ignoring broken instrumentation test in order to release

Co-authored-by: ganfra <francoisg@element.io>
Co-authored-by: Benoit Marty <benoitm@matrix.org>
Co-authored-by: Adam Brown <adampsbrown@gmail.com>
2022-06-21 14:47:13 +01:00
Adam Brown
3390e206b0 Merge branch 'release/v1.4.22' 2022-06-14 15:13:14 +01:00
Adam Brown
8cee066ba3 generating 1.4.22 changelog 2022-06-14 15:11:33 +01:00
Adam Brown
2eeba285e8 only hide the connect to server option when the new FTUE journey is enabled 2022-06-14 14:54:33 +01:00
Adam Brown
10eebff8a6 updating generated fastlane readme 2022-06-14 12:45:52 +01:00
Adam Brown
163212554b
Merge pull request #6302 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-06-14 12:35:16 +01:00
Weblate
ba0c7abfc5 Merge branch 'origin/develop' into Weblate. 2022-06-14 09:56:35 +00:00
Adam Brown
11b0ed99b5
Merge pull request #6223 from vector-im/feature/adm/exit-onboarding-copy
Avoid manual line breaks in exit onboarding dialog copy
2022-06-14 10:54:19 +01:00
Ihor Hordiichuk
134e86ecdd Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-06-14 09:50:21 +00:00
Florian Renaud
ecfd9a5eb3
Merge pull request #6295 from vector-im/dependabot/gradle/com.squareup.okhttp3-okhttp-bom-4.10.0
Bump okhttp-bom from 4.9.3 to 4.10.0
2022-06-14 11:09:51 +02:00
Adam Brown
01c70e165d
Merge pull request #6293 from vector-im/feature/adm/ftue-tweaks
FTUE - Minor tweaks
2022-06-13 16:35:47 +01:00
Onuray Sahin
2fbbee2d65
Merge pull request #6264 from vector-im/feature/ons/fix_flickering_location_bottom_bar
Fix flickering bottom bar of live location item [PSF-1057]
2022-06-13 18:23:10 +03:00
Yaron Shahrabani
e08a78b396 Translated using Weblate (Hebrew)
Currently translated at 9.8% (6 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/he/
2022-06-13 12:32:13 +00:00
Yaron Shahrabani
b4723414a2 Translated using Weblate (Hebrew)
Currently translated at 96.2% (2155 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
2022-06-13 12:32:13 +00:00
dependabot[bot]
eba52ea54f
Bump okhttp-bom from 4.9.3 to 4.10.0
Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.9.3 to 4.10.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.3...parent-4.10.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 12:24:55 +00:00
Benoit Marty
4ea4990177 Merge remote-tracking branch 'origin/develop' into develop 2022-06-13 14:12:00 +02:00
Benoit Marty
aac2df85bb Version++ 2022-06-13 14:10:48 +02:00
Benoit Marty
31bc66717f Merge branch 'hotfix/1.4.20' into main 2022-06-13 14:08:50 +02:00
Benoit Marty
d876690fc7 Merge branch 'hotfix/1.4.20' into develop 2022-06-13 14:08:49 +02:00
Onuray Sahin
eb49ceb803
Merge pull request #6280 from vector-im/feature/ons/live_location_sharing_report
Add report action for live location messages [PSF-1067]
2022-06-13 14:23:11 +03:00
Benoit Marty
4fa8e70276 Prepare hotfix 1.4.20 2022-06-13 12:37:39 +02:00
ganfra
2a9ac539e4 Change after PR review 2022-06-13 12:35:39 +02:00
ganfra
c384a3de8d Fix EventInsertLiveObserver gets blocked by reverting and adding lock instead 2022-06-13 12:35:20 +02:00
Adam Brown
b3adad8543 hiding connect to server button in favour of handling as part of the FTUE v2 work 2022-06-13 11:33:51 +01:00
Valere
65bb1a7ddc Fix space orphan filtering 2022-06-13 12:33:14 +02:00
Benoit Marty
91fc75fa5c
Merge pull request #6289 from vector-im/sync-analytics-plan
Sync analytics plan
2022-06-13 12:30:45 +02:00
Adam Brown
fca06bd167 always showing the celebration confetti on account creation
- previously we would wait until after personalisation but we don't know if users will go through that flow
2022-06-13 08:55:43 +01:00
bmarty
ad787d3914 Sync analytics plan 2022-06-13 00:03:16 +00:00
swag
90c78ac401 Translated using Weblate (Croatian)
Currently translated at 32.6% (731 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hr/
2022-06-10 16:32:13 +00:00
Benoit Marty
88d2853a31
Merge pull request #6281 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.50
Bump libphonenumber from 8.12.49 to 8.12.50
2022-06-10 18:13:25 +02:00
dependabot[bot]
5689006c81
Bump libphonenumber from 8.12.49 to 8.12.50
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.49 to 8.12.50.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.49...v8.12.50)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-10 13:38:47 +00:00
Michael Kaye
027619aa01
Merge pull request #6248 from vector-im/michaelk/sonar_on_vector
Improve Sonar coverage, including im.vector tests
2022-06-10 14:38:06 +01:00
Benoit Marty
990a6832bd
Merge pull request #6247 from vector-im/feature/ons/fix_static_map_copyright_size
Fix copyright attributions of map views [PSF-1058] - [PSF-1072]
2022-06-10 13:56:24 +02:00
Onuray Sahin
4ac314ab10 Changelog added. 2022-06-10 14:11:27 +03:00
Onuray Sahin
d8947f5c0b Add report action for live location messages. 2022-06-10 14:01:43 +03:00
Michael Kaye
d84b768db3 Don't run tests in the UI folder for coverage. 2022-06-09 23:58:50 +01:00
Michael Kaye
c8afdfc731 Update to latest sonarqube plugin.
Removes a bunch of (false) error messages.
2022-06-09 23:58:27 +01:00
Michael Kaye
f8f006d41c Ignore generated and other template classes. 2022-06-09 23:58:04 +01:00
Michael Kaye
d1a3e02faf Ignore all failing tests 2022-06-09 21:40:22 +01:00
Michael Kaye
38126c6b4f Refactor test to be more lenient in timing 2022-06-09 21:39:43 +01:00
rebok dev
890cc72ea3 Translated using Weblate (Polish)
Currently translated at 77.0% (47 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
2022-06-09 13:32:12 +00:00
rebok dev
f4f58703d3 Translated using Weblate (Polish)
Currently translated at 100.0% (2239 of 2239 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2022-06-09 13:32:11 +00:00
Kat Gerasimova
8fb6957bc0 Fix triage automation 2022-06-09 13:17:01 +01:00
Onuray Sahin
f9f1b3e39a Code review fix. 2022-06-09 13:09:10 +03:00
Benoit Marty
928183ff64
Merge pull request #6126 from vector-im/task/eric/when-arrow-alignment
Code Style Change - Disable when arrow alignment
2022-06-08 16:09:20 +02:00
Onuray Sahin
0f0d828655 Changelog added. 2022-06-08 16:06:39 +03:00