Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-17 02:15:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,309 Commits 530 Branches 157 Tags 485 MiB
ead8cec4a6
Commit Graph

17309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Benoit Marty
d43c802c90 Changelog 2022-07-04 17:48:35 +02:00
Benoit Marty
1355178fee Fix compilation issue for Fragment 2022-07-04 17:42:58 +02:00
Benoit Marty
81505d3802 Menu: extract management to a common interface / Migrate Fragments 2022-07-04 17:30:06 +02:00
Adam Brown
8811f752e5 converting if/else to when 2022-07-04 16:15:01 +01:00
Benoit Marty
be099dcae0 Menu: extract management to a common interface / Migrate Activities 2022-07-04 17:10:12 +02:00
Adam Brown
abf35d730d
Merge pull request #6157 from vector-im/feature/adm/ftue-msisdn-confirmation 
[FTUE] MSISDN / Phone number confirmation
 2022-07-04 11:29:39 +01:00
Maxime NATUREL
f3e7d0daff
Merge pull request #6431 from vector-im/fix/mna/closed-poll-visible-votes 
[Poll] - Wrong votes in closed poll after removing 2 previous polls (PSG-590)
 2022-07-04 11:33:26 +02:00
Maxime NATUREL
906fe8be76
Merge pull request #6425 from vector-im/fix/mna/undisclosed-poll-description 
[Poll] - Add a description under undisclosed poll when not ended (PSB-134)
 2022-07-04 11:20:59 +02:00
Adam Brown
2a36dc8ee5 using confirmation copy for the confirmation code entry field 2022-07-04 09:44:45 +01:00
Benoit Marty
941c2a792f
Merge pull request #6409 from vector-im/dependabot/gradle/com.google.gms-google-services-4.3.13 
Bump google-services from 4.3.10 to 4.3.13
 2022-07-04 10:24:26 +02:00
Adam Brown
daecd7d43a returning the error result directly from the when 2022-07-04 09:21:15 +01:00