Commit graph

17340 commits

Author SHA1 Message Date
Florian Renaud
68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
2022-07-11 12:03:24 +02:00
Adam Brown
5a378383f5
Merge pull request #6454 from vector-im/feature/adm/ftue-edit-server-bug
FTUE - Homeserver edits not updating the selected server UI
2022-07-08 11:35:17 +01:00
Adam Brown
6a2a69ada6
Merge pull request #6418 from vector-im/dependabot/gradle/lifecycle-2.5.0
Bump lifecycle from 2.4.1 to 2.5.0
2022-07-08 10:00:18 +01:00
Adam Brown
cf22a76742
Merge pull request #6473 from vector-im/feature/adm/list-initial-value
Fixing numbered lists always starting from 1
2022-07-08 09:13:30 +01:00
Adam Brown
ead8cec4a6 adding test case for showing html entities are processed 2022-07-07 13:54:42 +01:00
Adam Brown
cfb1e09d64 adding tests around the event html rendering
- the test helper is a little hacky in order to covert the spans to something human readable
2022-07-07 13:47:42 +01:00
Adam Brown
a0f86d270b removing extra line 2022-07-07 13:47:42 +01:00
Adam Brown
ff2fc3e0a7 adding changelog entry 2022-07-07 13:47:42 +01:00
Adam Brown
d904ebbd70 overriding the default list handler with an implementation that takes into account the initial starting position 2022-07-07 13:47:42 +01:00
Adam Brown
1ba986d45a trigger CI 2022-07-07 12:29:42 +01:00
Adam Brown
8a68b31f1b Merge branch '1.4.27-RC2' into develop 2022-07-07 11:29:49 +01:00
Benoit Marty
1659ca001d
Merge pull request #6491 from vector-im/dependabot/gradle/flipper-0.153.0
Bump flipper from 0.152.0 to 0.153.0
2022-07-07 12:28:10 +02:00
Adam Brown
7f1bcacd97 Merge branch 'hotfix/v1.4.27' into develop 2022-07-07 11:26:59 +01:00
Adam Brown
67d5289f01
Merge pull request #6462 from vector-im/feature/fga/fix_6461
Timeline: fix validation of timeline event changes
2022-07-07 11:25:33 +01:00
Adam Brown
3e770f9efa
Merge pull request #6474 from vector-im/feature/fga/fix_6463
Fix crashes when opening Thread (#6463)
2022-07-07 11:12:28 +01:00
Adam Brown
4126e6418b
Merge pull request #6469 from vector-im/feature/bma/fix_crash_on_DefaultBackgroundDetectionObserver
Fix ConcurrentModificationException on BackgroundDetectionObserver
2022-07-07 10:58:26 +01:00
ganfra
8abae6f917 Use executeTransactionAwait (need realm refresh in this case) 2022-07-07 09:40:54 +01:00
dependabot[bot]
7c3257942c
Bump flipper from 0.152.0 to 0.153.0
Bumps `flipper` from 0.152.0 to 0.153.0.

Updates `flipper` from 0.152.0 to 0.153.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.152.0...v0.153.0)

Updates `flipper-network-plugin` from 0.152.0 to 0.153.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.152.0...v0.153.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-06 23:05:35 +00:00
ganfra
19fc97ba0f Use executeTransactionAwait (need realm refresh in this case) 2022-07-06 19:33:34 +02:00
Adam Brown
2cbb5306f9 generating 1.4.27 changelog and updating version 2022-07-06 16:11:11 +01:00
Adam Brown
310c4b4a24 Fixing crash when sharing plain text, such as a url 2022-07-06 15:20:43 +01:00
ganfra
6f74f28561 Fix crashes when opening Thread (#6463) 2022-07-06 15:19:40 +01:00
ganfra
6b8bbf2574 Timeline: fix validation of timeline event changes 2022-07-06 15:19:26 +01:00
Benoit Marty
41a3a07bf6 Fix ConcurrentModificationException on BackgroundDetectionObserver 2022-07-06 15:18:52 +01:00
Benoit Marty
09f158e85d
Merge pull request #6468 from vector-im/bmarty-patch-1
Fix typo
2022-07-06 15:52:11 +02:00
Adam Brown
89348995c2
Merge pull request #6467 from vector-im/feature/adm/share-text-crash
Crash - Sharing text
2022-07-06 11:24:56 +01:00
Benoit Marty
7616912411
Merge pull request #6436 from vector-im/feature/bma/activity_fragment_1_5_0
Upgrade androidx activity and fragment to 1.5.0
2022-07-06 11:44:22 +02:00
ganfra
0743140973 Fix crashes when opening Thread (#6463) 2022-07-05 17:00:01 +02:00
Benoit Marty
d957e24747
Merge pull request #6458 from vector-im/feature/bma/android_services
Rename Android Service to use `AndroidService` suffix
2022-07-05 14:07:36 +02:00
Adam Brown
03202080b3 suppressing unused string resource 2022-07-05 11:17:10 +01:00
Benoit Marty
b68e01cda4 Changelog 2022-07-05 12:11:50 +02:00
Benoit Marty
b847d8cf36 Fix ConcurrentModificationException on BackgroundDetectionObserver 2022-07-05 12:06:49 +02:00
Benoit Marty
16c6cdf108
Fix typo 2022-07-05 11:45:01 +02:00
Adam Brown
3c092c4e2a adding changelog entry 2022-07-05 10:37:41 +01:00
Benoit Marty
4f19034a94 Exclude AndroidService from coverage metrics. 2022-07-05 11:17:40 +02:00
ganfra
f58ba13ef0 Timeline: fix validation of timeline event changes 2022-07-05 10:41:22 +02:00
Benoit Marty
a51d626fe8 Changelog 2022-07-05 09:40:27 +02:00
Benoit Marty
35325db407
Merge pull request #6456 from vector-im/bmarty-patch-1
Fix copy paste issue
2022-07-05 09:39:11 +02:00
Benoit Marty
f0c8c3fd63 Rename Android Service to use AndroidService suffix to limit confusion with our Matrix SDK Services 2022-07-04 21:39:01 +02:00
Benoit Marty
293a177148 Quick rework, better to search for expected MenuItem 2022-07-04 21:27:28 +02:00
Benoit Marty
3e42cec4ec Fix detekt issue. 2022-07-04 21:15:38 +02:00
Benoit Marty
57f42ed0f5
Fix copy paste issue 2022-07-04 21:10:51 +02:00
Adam Brown
2c444527bd
Merge pull request #6447 from cloudrac3r/fix-html-entities
Fix HTML entities being displayed in messages
2022-07-04 17:31:34 +01:00
Adam Brown
dd397b9a48 splitting the share intent handling from the attachments helper
- decouples the attachment callback
2022-07-04 17:14:49 +01:00
Florian Renaud
414dc52f7d Fix copyright date 2022-07-04 18:03:43 +02:00
Florian Renaud
2b6bfc1ebc Create local events using local echo 2022-07-04 18:00:30 +02:00
Florian Renaud
e89bb0eea7 Set local room members as loaded 2022-07-04 17:53:21 +02:00
Benoit Marty
d43c802c90 Changelog 2022-07-04 17:48:35 +02:00
Florian Renaud
0d9cd2b3a3 Delete local room related entities with cascade 2022-07-04 17:47:48 +02:00
Benoit Marty
1355178fee Fix compilation issue for Fragment 2022-07-04 17:42:58 +02:00