1
0
mirror of https://github.com/vector-im/element-android.git synced 2025-07-31 07:04:23 +03:00

116 Commits

Author SHA1 Message Date
d4e3d451ba Apply dual licenses: AGPL + Element Commercial to file headers.
2 replace all actions have been performed:
- "SPDX-License-Identifier: AGPL-3.0-only" to "SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial"
- "Please see LICENSE in the repository root for full details." to "Please see LICENSE files in the repository root for full details."
2025-01-14 10:27:57 +01:00
ba9d78e0d2 Update licence header.
Other files.
2024-09-24 12:09:02 +02:00
757bd5ff32 Remove clock from core-utils module 2023-01-31 16:08:30 +01:00
3d87b796b4 Fix lint 2023-01-30 11:03:11 +01:00
1a9b3941ae Fix the check script, some folders have changed. 2022-10-13 12:51:23 +02:00
feb1a2a876 including vector-app in the code_quality script 2022-08-31 09:16:01 +01:00
6ac88a9420 Add a check on suspicious string template.
Especially we want to ensure that the app does not log unexpected content.
2022-08-16 16:05:40 +02:00
08fff48065 Revert "Simple check to prevent frozen class modificaiton"
This reverts commit 28ca03cc67.
2022-08-16 11:14:01 +02:00
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
aae6e20f9c Migration to activity 1.5.0. Rework menu management 2022-07-01 17:06:02 +02:00
28ca03cc67 Simple check to prevent frozen class modificaiton 2022-07-01 11:54:30 +02:00
5b185152c6 Remove non needed extra spaces: add a check 2022-05-20 09:48:05 +02:00
12644e9915 Merge pull request #5947 from vector-im/feature/bma/renaming
Small changes
2022-05-18 16:27:48 +02:00
b70bc20b99 This is now detected by detekt 2022-05-12 22:53:07 +02:00
133d1972a3 Check more modules 2022-05-05 15:03:59 +02:00
32bc93c87d Ensure the Clock interface is used. 2022-05-03 15:02:34 +02:00
c8aefd5828 Update issue hint 2022-04-13 13:42:15 +02:00
f4fba2dd2d Check usage of import org.matrix.android.sdk.internal app side 2022-04-12 15:38:20 +02:00
4d19d0370d matrix-sdk-android-rx module has been replaced by matrix-sdk-android-flow 2022-04-06 14:34:23 +02:00
91ab4726ad #3296
- Fixes after review.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-23 11:34:43 +01:00
b2a2fe2710 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
17de88e5f6 Remove the check on number of enum class.
Now that we have more developers, we can have conflict because ot the number of exception. Let's hope we will not do the mistake...
2022-01-24 18:12:41 +01:00
58197b8853 Fix enum class warning 2022-01-20 15:37:57 +01:00
3bd21d04d8 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
3f0122be01 Update nb of enum classes 2022-01-10 09:44:11 +01:00
ac5caccdf9 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
12abd3b019 updating enum class counter 2022-01-06 10:25:41 +00:00
48e15b1c36 Restore line deleted during GitHub conflict fixing by mistake 2022-01-04 16:15:25 +01:00
7bbea52e66 Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
2dc88d1477 Fix code quality 2022-01-03 20:22:57 +01:00
b39caeb04d 2 new enums 2022-01-03 15:27:59 +01:00
0d9bc188d7 Fix code quality issues 2021-12-26 00:48:11 +02:00
be33a53e56 code quality 2021-12-14 09:06:43 +01:00
6a3d4044ef removing unused imports and increasing enum allowance 2021-12-03 15:30:55 +00:00
6624039413 Use @id and not @+id when referencing ids in layouts - RelativeLayout and toolbarId 2021-12-01 22:44:07 +01:00
e106ff8de0 Use @id and not @+id when referencing ids in layouts - ConstraintLayout 2021-12-01 22:19:33 +01:00
2d17156861 Use @id and not @+id when referencing ids in layouts - accessibilityTraversal 2021-12-01 22:16:28 +01:00
6d3df0d802 Use @id and not @+id when referencing ids in layouts - ConstraintLayout 2021-12-01 22:13:21 +01:00
6ddf3f6e5a Fix lint errors 2021-11-10 22:31:23 +01:00
d3234b33d3 increase enum class allowance by 1 2021-10-26 20:03:10 +01:00
920f467231 Disqble some check, not true anymore 2021-10-01 14:11:26 +02:00
8fd784e275 Improve leave space (all + none) 2021-09-16 09:20:25 +02:00
aaa9c7e795 fix rebase 2021-07-30 19:05:47 +02:00
5adceaca23 Code quality 2021-07-30 18:44:14 +02:00
1aa706dee5 Lint fixes. 2021-07-30 15:25:02 +03:00
57c75f8039 Ugrade unstable room notice in settings
default update parent, clean migrate bottomsheet layout
2021-06-24 09:38:52 +02:00
ece9d19d8c Rename again the style to follow Android convention (G's review) 2021-06-16 11:59:08 +02:00
858bbfd8d2 Rename style to follow naming conventions
And move some files to the module
2021-06-15 21:37:27 +02:00
f0b28742ac textSize *sp -> style 2021-06-15 10:30:54 +02:00
03df4aac77 Cleanup 2021-06-14 21:46:05 +02:00