Commit Graph

17084 Commits

Author SHA1 Message Date
Adam Brown eef904b3d5 applying jvm memory settings to CI linting tasks
- should stop the task crashing on the CI
2022-06-23 16:35:37 +01:00
Johannes Marbach 231bd6292a Remove empty textStyle properties
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-06-23 12:14:02 +02:00
Johannes Marbach ec073552bd Expose pusher profile tag in advanced settings
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-06-23 10:56:28 +02:00
dependabot[bot] fb4c83b3c4
Bump dokka-gradle-plugin from 1.6.21 to 1.7.0
Bumps dokka-gradle-plugin from 1.6.21 to 1.7.0.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-23 08:33:40 +00:00
Adam Brown 2ab2af90e9
Merge pull request #6294 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.1.1
Bump dependency-check-gradle from 7.1.0.1 to 7.1.1
2022-06-23 09:32:46 +01:00
Adam Brown 1cfcc18407
Merge pull request #6322 from vector-im/dependabot/gradle/androidx.annotation-annotation-1.4.0
Bump annotation from 1.3.0 to 1.4.0
2022-06-23 09:31:59 +01:00
Adam Brown 4779b78616
Merge pull request #6274 from vector-im/dependabot/gradle/mavericks-2.7.0
Bump mavericks from 2.6.1 to 2.7.0
2022-06-23 09:31:26 +01:00
Adam Brown 1a898a8ad5
Merge pull request #6343 from vector-im/dependabot/gradle/com.facebook.flipper-flipper-0.150.0
Bump flipper from 0.149.0 to 0.150.0
2022-06-23 09:30:10 +01:00
Adam Brown d6abd176fc
Merge pull request #6354 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.3
Bump kotlinCoroutines from 1.6.2 to 1.6.3
2022-06-23 09:29:39 +01:00
Onuray Sahin 2be43e9294 Test isVotable function. 2022-06-22 17:18:17 +03:00
Onuray Sahin a7bc2ef3bc Changelog added. 2022-06-22 16:45:22 +03:00
Onuray Sahin aab558af09 Test ended poll option view states. 2022-06-22 16:40:11 +03:00
Onuray Sahin d0d2929a84 Test undisclosed option view states. 2022-06-22 16:29:19 +03:00
dependabot[bot] 4e6e5041d8
Bump flipper from 0.149.0 to 0.150.0
Bumps [flipper](https://github.com/facebook/flipper) from 0.149.0 to 0.150.0.
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.149.0...v0.150.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-22 13:04:17 +00:00
Benoit Marty 29d4916a2e
Cleanup of #5187 (#6326)
Update design and behaviour on widget permission bottom sheet
2022-06-22 15:04:02 +02:00
Benoit Marty c4e578a653
Merge pull request #6344 from vector-im/dependabot/gradle/com.facebook.flipper-flipper-network-plugin-0.150.0
Bump flipper-network-plugin from 0.149.0 to 0.150.0
2022-06-22 15:02:46 +02:00
Benoit Marty 37371ac024
Merge pull request #6360 from vector-im/dependabot/gradle/com.autonomousapps.dependency-analysis-1.7.0
Bump com.autonomousapps.dependency-analysis from 1.5.0 to 1.7.0
2022-06-22 15:01:25 +02:00
Adam Brown 9925cf9996
Merge pull request #6362 from vector-im/bugfix/adm/dispatch-to-crash
Fixing concurrent `dispatchTo` crash
2022-06-22 14:00:20 +01:00
Benoit Marty 03d6ace3ae
Merge pull request #6359 from vector-im/dependabot/gradle/com.kgurgul.flipper-flipper-realm-android-2.2.0
Bump flipper-realm-android from 2.1.0 to 2.2.0
2022-06-22 14:54:52 +02:00
Adam Brown 0aacde9d9d updating version for next development cycle
- also fixes wrong version in changes doc
2022-06-22 13:48:56 +01:00
Adam Brown dff0f9d1bc Merge branch 'main' into develop 2022-06-22 13:47:31 +01:00
Onuray Sahin 8bb421a916 Test poll voted option view states. 2022-06-22 15:44:28 +03:00
Onuray Sahin 0f0492db3b Test ready option view states. 2022-06-22 15:27:04 +03:00
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
Adam Brown 23cd6dae42 fixing concurrent dispatch crash by using copy on write set
- whilst closing the session, we iterate through all the listeners calling onSessionStopped however some implementations also use this callback to remove themselves from the listeners, causing the concurrent modification crash
2022-06-22 12:19:06 +01:00
Onuray Sahin 2cf40cbcf2 Test sending option view states. 2022-06-22 14:05:42 +03: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 4e42bedde9
Fix migration to 30. Seems that `isNull` with long path is not working correctly. (#6361) 2022-06-22 11:49:38 +01:00
Onuray Sahin 5a948891f0 Test ready poll state. 2022-06-22 13:27:52 +03:00
Onuray Sahin 2c5ddca821 Test voted poll state. 2022-06-22 13:21:50 +03:00
Onuray Sahin 0fe4b9f07f Test undisclosed poll state. 2022-06-22 12:57:50 +03:00
Benoit Marty 8bea64bc0c Fix migration to 30. Seems that `isNull` with long path is not working correctly. 2022-06-22 11:56:54 +02:00
Onuray Sahin 8854b81977 Test ended poll state. 2022-06-22 12:34:52 +03:00
Onuray Sahin a886e93c7e Test sending poll state. 2022-06-22 12:13:53 +03:00
Adam Brown a8cd6ca497 Merge branch 'main' into develop 2022-06-22 08:49:48 +01:00
Johan Smits 6da4245efb Translated using Weblate (Dutch)
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/nl/
2022-06-22 06:32:16 +00:00
Priit Jõerüüt cd6d06529e Translated using Weblate (Estonian)
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/et/
2022-06-22 06:32:16 +00:00
Cadence Ember 216de6c050
Lint (import ordering) 2022-06-22 13:10:30 +12:00
dependabot[bot] f1056898ed
Bump com.autonomousapps.dependency-analysis from 1.5.0 to 1.7.0
Bumps [com.autonomousapps.dependency-analysis](https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin) from 1.5.0 to 1.7.0.
- [Release notes](https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/releases)
- [Changelog](https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/compare/v1.5.0...v1.7.0)

---
updated-dependencies:
- dependency-name: com.autonomousapps.dependency-analysis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-21 23:43:06 +00:00
dependabot[bot] c81866f34e
Bump flipper-realm-android from 2.1.0 to 2.2.0
Bumps [flipper-realm-android](https://github.com/kamgurgul/Flipper-Realm) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/kamgurgul/Flipper-Realm/releases)
- [Commits](https://github.com/kamgurgul/Flipper-Realm/compare/2.1.0...2.2.0)

---
updated-dependencies:
- dependency-name: com.kgurgul.flipper:flipper-realm-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-21 23:41:39 +00:00
Onuray Sahin 77dfd5f826 Create initial test class. 2022-06-21 17:26:26 +03:00
Cadence Ember 592f890fac
Fix formatted_body being parsed as Markdown
Background: Clients write Markdown and convert it to HTML before
sending the event. All events are formatted as HTML. However, if an
HTML formatted event happened to include markdown characters, Element
Android would incorrectly render that markdown.

For example, an event with formatted_body: "*test*" should be
displayed as literally *test* with no effects, but Element Android
incorrectly displayed it as test in italics.

This commit fixes this behaviour, making Element Android not parse
Markdown in HTML messages.

From the perspective of most users it will appear that backslash
escapes now work properly (even though this wasn't the real issue).
2022-06-22 02:24:07 +12:00
Onuray Sahin bd9fa48312 Refactor poll item factory to make it testable. 2022-06-21 17:03:56 +03: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
ganfra b07e0a47e8
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:42:50 +01:00
Adam Brown 41431cd1d2
Merge pull request #6307 from vector-im/feature/adm/ci-test-coverage
Missing unit test coverage
2022-06-21 10:17:42 +01:00
Adam Brown 8754f230d3 removing debug log 2022-06-21 09:15:28 +01:00
Adam Brown 42be961681 applying sanity test filter to the start params 2022-06-21 09:15:28 +01:00