mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-21 08:43:02 +03:00
Code Issues Projects Releases Packages Wiki Activity
9872 commits 7 branches 123 tags 230 MiB
Commit graph

3558 commits

Author SHA1 Message Date
Benoit Marty
9c1bec94c9 Create AtomicFileCreator class to avoid code copy/paste 2021-07-19 10:59:40 +02:00
Benoit Marty
2e64f89ec6
Merge pull request #3656 from SpiritCroc/broken_downloads 
Avoid incomplete downloads in cache
 2021-07-19 10:50:52 +02:00
Benoit Marty
45efb4386b
Merge pull request #3668 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.68 
Bump kluent-android from 1.67 to 1.68
 2021-07-16 18:05:45 +02:00
Benoit Marty
343ea42ef5 Fix issue on Android 21 2021-07-15 17:30:48 +02:00
Paulo Pinto
5d4e71a011 Standardise casing of integration manager 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-15 15:58:50 +01:00
Paulo Pinto
d39e14cc5c Standardise casing of homeserver 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-15 15:58:50 +01:00
Paulo Pinto
74104d7d84 Standardise casing of identity server 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-15 15:58:50 +01:00
Paulo Pinto
e61c8c28bb Standardise spelling and casing of homeserver 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-15 15:58:50 +01:00
Benoit Marty
bb742eb483 Handle record/play error 2021-07-15 15:06:38 +02:00
Benoit Marty
0cf10b2f84 Fix issue with waveform rendering 2021-07-13 18:48:59 +02:00
Benoit Marty
df795d1881 Cleanup 2021-07-13 18:17:11 +02:00
Benoit Marty
6a0ea11e7a Follow the spec regarding waveform content 2021-07-13 17:58:14 +02:00
Benoit Marty
9df874c975 Merge branch 'develop' into feature/ons/voice_message 2021-07-13 10:36:05 +02:00
dependabot[bot]
b0ea022eea
Bump kluent-android from 1.67 to 1.68 
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.67 to 1.68.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/commits)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 23:07:08 +00:00
TheWayOfTheWarrior
995f9d87bb
Typo in InitializeCrossSigningTask.kt 
Typo in comment. Was "userSigningKey" instead of "selfSigningKey".
 2021-07-10 22:17:17 +02:00
SpiritCroc
4ef1f5c90f Avoid incomplete downloads in cache 
Previously, when a download was aborted (e.g. due to a bad internet
connection), a partly downloaded file was remaining in cache, which
would then be delivered upon later requests.
This can lead e.g. to chats where images aren't loading.

To avoid this, first download files to a temporary file that is not the
final cache file, and only rename/move it on finish.

Note that if you already have broken downloads, you still need to clear
cache once to get rid of them after this commit, but it should not
occur anymore afterwards.
 2021-07-10 11:12:15 +02:00
Benoit Marty
e391a1371c Merge branch 'develop' into feature/ons/voice_message 2021-07-09 22:19:50 +02:00
Benoit Marty
db80ea6432 Prefer testing attachment.waveform to see if it's a voice message 2021-07-09 22:17:04 +02:00
Benoit Marty
984112e83f Also copy waveform when sending again 2021-07-09 22:15:50 +02:00
Benoit Marty
963eb9daf4 Fix missing duration in audio event, and move AudioWaveformInfo to the proper package 2021-07-09 22:06:09 +02:00
Benoit Marty
2ca0a99dce Follow the spec 
https://github.com/matrix-org/matrix-doc/blob/travis/msc/voice-messages/proposals/3245-voice-messages.md#unstable-prefix
 2021-07-09 21:49:37 +02:00
Benoit Marty
910c0ff326
Merge pull request #3648 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.27 
Bump libphonenumber from 8.12.26 to 8.12.27
 2021-07-09 09:47:45 +02:00
Benoit Marty
2948f03978
Merge pull request #3551 from vector-im/feature/bca/room_upgrade 
Feature/bca/room upgrade
 2021-07-08 10:00:01 +02:00
dependabot[bot]
76890a3b26
Bump libphonenumber from 8.12.26 to 8.12.27 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.26 to 8.12.27.
- [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.26...v8.12.27)

---
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>
 2021-07-07 23:06:17 +00:00
Onuray Sahin
b1c7cb3219 Lint fixes. 2021-07-07 11:37:01 +03:00
Onuray Sahin
7a1b138894 Merge branch 'develop' into feature/ons/voice_message 
* develop: (286 commits)
  Fix crash after video call
  Fix issue on button styles
  Clean after benoits review
  Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
  Bump kotlin_version from 1.5.10 to 1.5.20
  Bump libphonenumber from 8.12.25 to 8.12.26
  Fix call invite processed after call is ended because of fastlane mode.
  Jump to unread: removes unnecessary check which can cause scroll issue
  Jump to unread: avoid blink when jumping
  Clean after Benoits review
  Delete unused drawable to avoid conflict on develop
  Jump to unread: add towncrier file.
  Read marker: fix some issues with jump to unread visibility.
  Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
  Reordering
  Add text style for dialogs
  Colored dialog button is now handled by the theme
  Update theme for material dialog and create a destructive variant
  Reorder buttons
  Update doc
  ...

# Conflicts:
#	library/ui-styles/src/main/res/values/theme_dark.xml
#	library/ui-styles/src/main/res/values/theme_light.xml
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
#	vector/src/main/res/values/strings.xml
 2021-07-06 13:17:49 +03:00
Benoit Marty
e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3 
Bump junit from 1.1.2 to 1.1.3
 2021-07-05 21:36:38 +02:00
Benoit Marty
ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown 
Improve wellknown usage
 2021-07-05 21:36:16 +02:00
Benoit Marty
d29e04f16c Create fun String.getDomain(): String to avoid duplicated code 2021-07-05 16:49:09 +02:00
Benoit Marty
67f41028ff Remove Riot ref: Riot -> Web client 2021-07-05 16:41:26 +02:00
dependabot[bot]
974d5c23d3
Bump junit from 1.1.2 to 1.1.3 
Bumps junit from 1.1.2 to 1.1.3.

---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 14:19:54 +00:00
Benoit Marty
d85099f23c
Merge pull request #3595 from vector-im/dependabot/gradle/espresso_version-3.4.0 
Bump espresso_version from 3.3.0 to 3.4.0
 2021-07-05 16:19:17 +02:00
Benoit Marty
edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields 
Cleanup redundant fields - TO BE MERGED ON JULY 1st
 2021-07-05 16:16:33 +02:00
Benoit Marty
b285bd0359 Merge branch 'develop' into feature/bca/room_upgrade 2021-07-05 16:01:27 +02:00
Benoit Marty
c40add88f9
Merge pull request #3617 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.1 
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
 2021-07-05 14:38:07 +02:00
dependabot[bot]
8639582671
Bump espresso_version from 3.3.0 to 3.4.0 
Bumps `espresso_version` from 3.3.0 to 3.4.0.

Updates `espresso-core` from 3.3.0 to 3.4.0

Updates `espresso-contrib` from 3.3.0 to 3.4.0

Updates `espresso-intents` from 3.3.0 to 3.4.0

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 12:38:04 +00:00
Benoit Marty
5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0 
Bump core-ktx from 1.5.0 to 1.6.0
 2021-07-05 14:37:48 +02:00
Benoit Marty
242962f770
Merge pull request #3594 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.12.0 
Bump mockk-android from 1.11.0 to 1.12.0
 2021-07-05 14:37:33 +02:00
Benoit Marty
ca39182665
Merge pull request #3592 from vector-im/dependabot/gradle/io.mockk-mockk-1.12.0 
Bump mockk from 1.11.0 to 1.12.0
 2021-07-05 14:37:20 +02:00
Benoit Marty
f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0 
Bump androidxTest_version from 1.3.0 to 1.4.0
 2021-07-05 14:37:14 +02:00
Benoit Marty
80b1aa3c01
Merge pull request #3590 from vector-im/dependabot/gradle/androidx.test-orchestrator-1.4.0 
Bump orchestrator from 1.3.0 to 1.4.0
 2021-07-05 14:37:07 +02:00
Benoit Marty
2513be744c CryptoStore migration has to be object to avoid crash 
Thread: main, Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. The most likely cause is that equals() and hashCode() are not overridden in the migration class: org.matrix.android.sdk.internal.database.RealmSessionStoreMigration
 2021-07-02 17:29:44 +02:00
Benoit Marty
7dc5d8490f
Merge pull request #3584 from vector-im/feature/bca/fix_oom_spacechild 
Fix / dm flattenParents always growing
 2021-07-02 09:35:51 +02:00
dependabot[bot]
9430d7a5dd
Bump realm-gradle-plugin from 10.6.0 to 10.6.1 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.6.0 to 10.6.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.6.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.6.0...v10.6.1)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-01 23:07:36 +00:00
Valere
adcd1a64df empty migration to fix big flattenParentIds for DM 2021-07-01 15:28:26 +02:00
Benoit Marty
ef31aad42c Fix copyright 2021-07-01 14:47:04 +02:00
Benoit Marty
ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00
Onuray Sahin
9d48b399df Voice message playback implementation. 2021-07-01 10:49:04 +03:00
dependabot[bot]
752290424c
Bump core-ktx from 1.5.0 to 1.6.0 
Bumps core-ktx from 1.5.0 to 1.6.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:07:55 +00:00
dependabot[bot]
7316bf4ee0
Bump mockk-android from 1.11.0 to 1.12.0 
Bumps [mockk-android](https://github.com/mockk/mockk) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:07:27 +00:00
dependabot[bot]
f1001231d6
Bump mockk from 1.11.0 to 1.12.0 
Bumps [mockk](https://github.com/mockk/mockk) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:35 +00:00
dependabot[bot]
2ebfeb1709
Bump androidxTest_version from 1.3.0 to 1.4.0 
Bumps `androidxTest_version` from 1.3.0 to 1.4.0.

Updates `core` from 1.3.0 to 1.4.0

Updates `runner` from 1.3.0 to 1.4.0

Updates `rules` from 1.3.0 to 1.4.0

---
updated-dependencies:
- dependency-name: androidx.test:core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:rules
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:24 +00:00
dependabot[bot]
3378be935b
Bump orchestrator from 1.3.0 to 1.4.0 
Bumps orchestrator from 1.3.0 to 1.4.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:02 +00:00
Benoit Marty
ec515ced66 PR review part 1 2021-06-30 18:54:13 +02:00
Benoit Marty
3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade 2021-06-30 17:56:32 +02:00
Benoit Marty
7292c4e13d Code quality 2021-06-30 13:57:42 +02:00
Benoit Marty
14ac5a292c Auto review 2021-06-30 12:32:43 +02:00
Benoit Marty
8f3db11693 Perform .well-known request first, even if the entered URL is a valid homeserver base url 2021-06-30 11:52:04 +02:00
Benoit Marty
a61917f2b4 Also change base URL for federationAPI 2021-06-30 11:19:22 +02:00
Benoit Marty
38cb8bd33e Store homeServerUriBase independently that the base URL for client-server API 
Also handle the migration for the specific matrix-client.matrix.org URL
 2021-06-30 11:07:24 +02:00
Benoit Marty
984b1dd6a8 RawService.getWellknown() now takes a domain instead of a matrixId as parameter 2021-06-30 09:20:08 +02:00
Valere
1d8b95560b Fix / dm flattenParents always growing 2021-06-29 14:57:43 +02:00
Benoit Marty
7f70a03f41 Use interface field 2021-06-29 10:58:28 +02:00
Benoit Marty
0d02a197a5 Remove redundant mimetype (vector-im/element-web#2547) 2021-06-29 10:58:28 +02:00
Benoit Marty
9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite 
Feature/fga/auto accept invite
 2021-06-28 16:40:10 +02:00
Valere
4aa93d79fe cleaning 2021-06-28 09:42:54 +02:00
Benoit Marty
060e9d7a7e
Merge pull request #3568 from vector-im/dependabot/gradle/kotlin_version-1.5.20 
Bump kotlin_version from 1.5.10 to 1.5.20
 2021-06-25 19:11:34 +02:00
Benoit Marty
631e7881ef Fix warning about implicit type, introduced in Kotlin 1.5.20. 
"Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
 2021-06-25 17:42:38 +02:00
Benoit Marty
2e37b5efa3
Merge pull request #3565 from vector-im/feature/fga/fix_call_notification 
Fix call invite processed after call is ended because of fastlane mode.
 2021-06-25 16:47:54 +02:00
dependabot[bot]
9e2f2f2372
Bump libphonenumber from 8.12.25 to 8.12.26 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.25 to 8.12.26.
- [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.25...v8.12.26)

---
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>
 2021-06-24 23:05:19 +00:00
ganfra
a2c8680d7a Fix call invite processed after call is ended because of fastlane mode. 2021-06-24 20:49:35 +02:00
Benoit Marty
ca3e5cdf90
Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67 
Bump kluent-android from 1.65 to 1.67
 2021-06-24 14:49:53 +02:00
Benoit Marty
14184aae6f
Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25 
Bump libphonenumber from 8.12.24 to 8.12.25
 2021-06-24 14:34:45 +02:00
Benoit Marty
f0fd40b189
Merge pull request #3505 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.0 
Bump realm-gradle-plugin from 10.5.0 to 10.6.0
 2021-06-24 14:32:35 +02:00
Valere
57c75f8039 Ugrade unstable room notice in settings 
default update parent, clean migrate bottomsheet layout
 2021-06-24 09:38:52 +02:00
Valere
171793d190 room version cap support + room upgrade 2021-06-22 17:35:39 +02:00
dependabot[bot]
e2e3e2de86
Bump kluent-android from 1.65 to 1.67 
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.65 to 1.67.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/commits)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 23:06:17 +00:00
ganfra
d8327a5161 Fix crash on signout: release session at the end so you clean up files first. 2021-06-21 11:10:10 +02:00
ganfra
4b6484d317 Merge branch 'develop' into feature/fga/auto_accept_invite 2021-06-18 17:37:24 +02:00
ganfra
c551cf3058 Clean and add towncrier 2021-06-18 17:30:32 +02:00
ganfra
6b10406622 AutoAcceptInvite: refact and hide behind flag 2021-06-18 17:24:51 +02:00
Valere
4180b4ccd3 Code review 2021-06-18 10:47:21 +02:00
Valere
19a2b56011 Code review AliasAvailabilityResult 2021-06-18 10:41:24 +02:00
Valere
b1ab6eb58f Add alias management in space settings 2021-06-18 10:41:13 +02:00
Valere
fb337dacd6 Add space alias in creation wizard 2021-06-18 10:41:13 +02:00
Benoit Marty
5325c761f4
Merge pull request #3502 from vector-im/feature/bca/spaces_dnd 
Feature/bca/spaces dnd
 2021-06-18 10:28:59 +02:00
Benoit Marty
bffa96ae10 Import sas strings 2021-06-18 10:25:37 +02:00
Valere
3dc7a6dc34 cleaning, quality 2021-06-17 17:00:28 +02:00
Valere
682e926965 Dnd enhancement 
+ klint fix
 2021-06-17 15:53:35 +02:00
Onuray Sahin
cb96886568 Send voice message. 2021-06-17 16:18:20 +03:00
Valere
944c9641a9 Code review 2021-06-17 14:44:24 +02:00
Valere
a1aad53769 Space top level ordering 2021-06-17 14:44:24 +02:00
dependabot[bot]
dd74b8a755
Bump libphonenumber from 8.12.24 to 8.12.25 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.24 to 8.12.25.
- [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.24...v8.12.25)

---
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>
 2021-06-15 06:25:21 +00:00
dependabot[bot]
6e83f0510e
Bump realm-gradle-plugin from 10.5.0 to 10.6.0 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.5.0 to 10.6.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.5.0...v10.6.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-15 06:24:33 +00:00
Benoit Marty
e9db1dbb08
Merge pull request #3488 from vector-im/dependabot/gradle/daggerVersion-2.37 
Bump daggerVersion from 2.36 to 2.37
 2021-06-11 12:24:49 +02:00
Benoit Marty
dfb01a462e
Merge pull request #3456 from vector-im/feature/fga/dial_pad_tab 
Feature/fga/dial pad tab
 2021-06-11 12:23:19 +02:00
dependabot[bot]
cc67e83b21
Bump daggerVersion from 2.36 to 2.37 
Bumps `daggerVersion` from 2.36 to 2.37.

Updates `dagger` from 2.36 to 2.37
- [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.36...dagger-2.37)

Updates `dagger-compiler` from 2.36 to 2.37
- [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.36...dagger-2.37)

---
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-06-11 05:54:29 +00:00
ganfra
68143ab2cf Merge branch 'develop' into feature/fga/voip_asserted_identity 2021-06-10 16:01:48 +02:00
ganfra
880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
 2021-06-10 15:37:24 +02:00
ganfra
dfcffb9464 Merge branch 'develop' into feature/fga/account_data_rework 2021-06-09 18:58:47 +02:00