Commit graph

9745 commits

Author SHA1 Message Date
David Langley
be19f759f6 fix ordering of chips and align left for notification screens. 2021-08-24 15:46:41 +01:00
David Langley
2598a67525 Only enabled keyword entry when checkbox enabled. 2021-08-24 10:45:46 +01:00
David Langley
8d7e3b6544 add keyword checkbox preference and chip/edit text for modificying keywords 2021-08-03 09:52:36 +01:00
David Langley
886bd3cc8f lint 2021-07-28 09:34:15 +01:00
David Langley
7405d501f6 lint 2021-07-27 20:38:13 +01:00
David Langley
60b351cddd fic towncrier text 2021-07-27 20:36:41 +01:00
David Langley
73bf50b93c rename global -> default, address comments 2021-07-27 20:21:40 +01:00
David Langley
7091de9942 merge in static push definitions and adapt push v2 ui/logic 2021-07-27 19:54:17 +01:00
Benoit Marty
00911a7f7e
Merge pull request #3681 from vector-im/feature/dla/fix_account_notifications_discrepancies
Fixes Changing Account Settings > Notifications > Advanced Notifications on android causes discrepancies with web
2021-07-27 15:14:35 +02:00
David Langley
9c139b3bd0 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies 2021-07-26 22:55:27 +01:00
David Langley
5d092ce18a simplify getHighlight logic 2021-07-23 14:29:37 +01:00
Benoit Marty
bdbfbe6175 Version++ 2021-07-23 11:53:21 +02:00
Benoit Marty
a7e1d61144 Merge branch 'release/1.1.14' into develop 2021-07-23 11:52:12 +02:00
Benoit Marty
ba7c5acd92 fastlane change 2021-07-23 11:50:46 +02:00
Benoit Marty
9ad1ad2156 Changelog 2021-07-23 11:49:16 +02:00
Benoit Marty
adabb31688 Changelog 2021-07-23 11:25:56 +02:00
Benoit Marty
0c211d7b1e
Merge pull request #3723 from vector-im/feature/fga/log_tags_voip
Feature/fga/log tags voip
2021-07-23 11:23:09 +02:00
Benoit Marty
b764746323
Merge pull request #3724 from vector-im/feature/bma/ensureOTK
Ensure OTKs are uploaded when the session is created
2021-07-23 11:21:07 +02:00
Benoit Marty
d0647abcc6
Merge pull request #3719 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.3.1
Bump appcompat from 1.3.0 to 1.3.1
2021-07-23 11:18:15 +02:00
ganfra
45a51d138e Voip log: clean after Benoit review 2021-07-23 09:50:09 +02:00
ganfra
e3464f58fa Call notif: make end call notif better 2021-07-22 18:51:36 +02:00
Benoit Marty
ed0143c240 Log errors 2021-07-22 16:20:16 +02:00
Benoit Marty
1d5ed46a49 Small cleanup 2021-07-22 16:01:01 +02:00
Benoit Marty
05988107a7 Ask the number of OTK if unknown from the sync. 2021-07-22 15:59:37 +02:00
Benoit Marty
952a0f7c07 change 2021-07-22 15:33:05 +02:00
ganfra
e356e71431 Merge branch 'develop' into feature/fga/log_tags_voip 2021-07-22 15:32:25 +02:00
Benoit Marty
7a7c292b3c Rename store API 2021-07-22 15:26:11 +02:00
Benoit Marty
be488ae75a Ensure OTK are uploaded when we upload the device keys
The sync response can omit the field device_one_time_keys_count.signed_curve25519 and the SDK was waiting to know this value to upload the OTK.
Now the SDK uploads the OTK when it uploads the device keys.
2021-07-22 15:24:05 +02:00
ganfra
79c8ef7ebf LoggerTag: try new thing and branch more on VOIP 2021-07-22 15:22:15 +02:00
dependabot[bot]
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1
Bumps appcompat from 1.3.0 to 1.3.1.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-22 12:13:24 +00:00
Benoit Marty
2070b0ecde
Merge pull request #3718 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.6
Bump fragment-ktx from 1.3.5 to 1.3.6
2021-07-22 14:12:42 +02:00
Benoit Marty
0ff222bc0b
Merge pull request #3716 from vector-im/dependabot/gradle/androidx.media-media-1.4.0
Bump media from 1.3.1 to 1.4.0
2021-07-22 14:12:09 +02:00
Benoit Marty
19f9f5a6ee
Merge pull request #3715 from vector-im/feature/bma/initialState
Add initialState support to CreateRoomParams
2021-07-22 14:11:49 +02:00
Benoit Marty
a2d7d54550
Merge pull request #3721 from vector-im/anoa/servers
grammar: Server matching ... -> Servers matching ...
2021-07-22 14:11:07 +02:00
Benoit Marty
cededa8c3b
Merge pull request #3720 from vector-im/feature/bma/fix_signout_crash
Fix a crash which can happen when user signs out.
2021-07-22 14:10:53 +02:00
Andrew Morgan
74aea4611a Changelog 2021-07-22 12:02:44 +01:00
Andrew Morgan
4dd5b2c884
grammar: Server matching ... -> Servers matching ...
This commit uses the plural form of Server as each message is talking about *one or more* servers in the room.
2021-07-22 11:58:32 +01:00
Benoit Marty
4bbf175187 Fix a crash which can happen when user signs out.
The crypto DB has been deleted, and the key download request is cancelled, but in the catch block we tried to write to the deleted DB
2021-07-22 12:48:13 +02:00
ganfra
115f00ff1a Start experiment on log tags 2021-07-22 10:12:46 +02:00
Benoit Marty
5d65c83a3d
Merge pull request #3712 from vector-im/feature/fga/missed_call_notification
Feature/fga/missed call notification
2021-07-22 09:46:40 +02:00
dependabot[bot]
76f412ffe8
Bump fragment-ktx from 1.3.5 to 1.3.6
Bumps fragment-ktx from 1.3.5 to 1.3.6.

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-21 23:05:41 +00:00
dependabot[bot]
b6e739afd3
Bump media from 1.3.1 to 1.4.0
Bumps media from 1.3.1 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.media:media
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-21 23:04:46 +00:00
Benoit Marty
966a959e41 do not send empty invite list when creating a room 2021-07-21 20:56:08 +02:00
Benoit Marty
b862e5ccbf Add initialState support to CreateRoomParams (#3713) 2021-07-21 20:53:17 +02:00
ganfra
8955049110 Minor changes after benoits review 2021-07-21 17:35:08 +02:00
ganfra
5dda5a107a Missed call notif: make some cleanup and minor changes 2021-07-21 12:28:14 +02:00
Benoit Marty
98720ce4a5
Merge pull request #3707 from poljar/poljar/fix/verification-transaction-id-mixup
crypto: Don't use the transaction ID of the verification for the request
2021-07-21 09:39:22 +02:00
Benoit Marty
e4ae80e348
Merge pull request #3708 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.28
Bump libphonenumber from 8.12.27 to 8.12.28
2021-07-21 09:28:19 +02:00
Benoit Marty
135123d265
Merge pull request #3709 from vector-im/dependabot/gradle/daggerVersion-2.38
Bump daggerVersion from 2.37 to 2.38
2021-07-21 09:27:47 +02:00
dependabot[bot]
89dc4bb13e
Bump daggerVersion from 2.37 to 2.38
Bumps `daggerVersion` from 2.37 to 2.38.

Updates `dagger` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38)

Updates `dagger-compiler` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-20 23:06:50 +00:00