Commit Graph

21 Commits

Author SHA1 Message Date
Adam Brown
d2fbe26182 removing no longer needed butterknife dependency 2022-06-29 17:22:57 +01:00
Adam Brown
33ca5753f1 replacing epoxy item annotation layout references with getDefaultLayoutId override 2022-06-29 17:21:05 +01:00
ericdecanini
5cc7deea4e Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
#	vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
#	vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
#	vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
#	vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
#	vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
2022-06-03 12:06:23 +02:00
ericdecanini
b3fdb5ed17 Changes code style when arrow alignment 2022-05-23 12:57:57 +02:00
Olivér Falvai
f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Benoit Marty
12644e9915
Merge pull request #5947 from vector-im/feature/bma/renaming
Small changes
2022-05-18 16:27:48 +02:00
Olivér Falvai
388e35e828 Remove even more deps 2022-05-18 14:19:11 +02:00
Benoit Marty
e35ee03178 Try to workaround Dependabot issue #5961 2022-05-09 11:40:53 +02:00
Marcel
3f56dad1eb
Fixed dependabot 2022-05-06 18:23:58 +02:00
Benoit Marty
26edf79aa2 Fix detected issues 2022-05-05 15:04:43 +02:00
ericdecanini
de899bbb18 Formats entire project 2022-04-21 11:50:15 +02:00
Benoit Marty
ed62a2f1c9 Format file (no other change) 2022-03-22 16:13:06 +01:00
Benoit Marty
f07c9bf105 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
dependabot[bot]
c2e3c63100
Bump json from 20211205 to 20220320
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 23:09:06 +00:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
dependabot[bot]
8d37dc5118
Bump json from 20190722 to 20211205
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20190722 to 20211205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-18 23:08:02 +00:00
Benoit Marty
2dfded7326 Remove comment 2022-01-18 14:42:32 +01:00
Benoit Marty
a38a03c980 Use class from common module 2022-01-18 14:41:35 +01:00
Benoit Marty
f0d5260be8 Fix unit test 2022-01-18 12:34:14 +01:00
Benoit Marty
2a7719cdf6 ktlint 2022-01-18 12:12:36 +01:00
Benoit Marty
bdd30e3b8f Fix crash when viewing source which contains an emoji.
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00