mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
20247 commits 6 branches 120 tags 229 MiB
Commit graph

5611 commits

Author SHA1 Message Date
SpiritCroc
bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36 
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	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/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-09-10 15:24:40 +02:00
Maxime NATUREL
669beb1156 Fix missing mapper in CryptoStoreHelper for tests 2022-09-07 10:27:19 +02:00
Maxime NATUREL
fb8d4668d8 Fixing wrong copyright title 2022-09-07 09:32:47 +02:00
Maxime NATUREL
611749c08f Adding unit tests for mapper 2022-09-07 09:32:47 +02:00
Maxime NATUREL
e542dc4aac Adding a method to retrieve livedata of crypto device info for a given device id 2022-09-07 09:32:47 +02:00
Maxime NATUREL
f74a0b0901 Adding a method to retrieve livedata of device info for a given device id 2022-09-07 09:32:47 +02:00
Maxime NATUREL
2a599d9760 Small renamings/reorganization in CryptoService 2022-09-07 09:32:47 +02:00
Adam Brown
5c994ebfdd lifting the phonenumber dependency to the deps file and exposing as api for the app level module 2022-08-31 09:16:00 +01:00
Benoit Marty
456d831a7d
Merge pull request #6917 from vector-im/feature/bma/incr_sync_perf 
Feature/bma/incr sync perf
 2022-08-31 09:06:32 +02:00
Benoit Marty
51dcaf7556
Merge pull request #6925 from vector-im/feature/bma/http_log 
Feature/bma/http log
 2022-08-29 15:04:46 +02:00
Benoit Marty
a8eb7d95ac Create a new fun for code clarity 2022-08-29 14:32:12 +02:00
Benoit Marty
f668be5266
Remove tmp comment 2022-08-29 12:39:58 +02:00
Florian Renaud
ee7c0593ba Fix copyright 2022-08-25 14:37:06 +02:00
Florian Renaud
cac4df7d66 Improve createRoomThreePidEvents for clarity 2022-08-25 14:28:17 +02:00
Florian Renaud
eab4ebc3b1 Remove roomCreatorUserId and use current userId by default 2022-08-25 14:16:20 +02:00
Florian Renaud
90d688c222 Remove useless explicit field type 2022-08-25 14:07:50 +02:00
Florian Renaud
2be2a05795 Change visibility of LocalRoomThirdPartyInviteContent to internal 2022-08-25 14:05:25 +02:00
Florian Renaud
110cabaca1 Remove useless apply in CreateLocalRoomStateEventsTask 2022-08-25 14:00:58 +02:00
Florian Renaud
5d1124aa95 Update doc 2022-08-25 13:57:50 +02:00
Florian Renaud
128ff0d6ec Extract condition to reduce code complexity 2022-08-25 13:57:50 +02:00
Florian Renaud
cbf9dbf290 Verify tombstone event 2022-08-25 13:57:50 +02:00
Florian Renaud
725537d8fe Remove safe call 2022-08-25 13:57:50 +02:00
Florian Renaud
3905e564bd Add unit tests for CreateRoomFromLocalRoomTask 2022-08-25 13:57:49 +02:00
Florian Renaud
882065f6cd Add unit tests for CreateLocalRoomStateEventsTask 2022-08-25 13:57:49 +02:00
Florian Renaud
e22ce0d842 Set stateKey as empty by default 2022-08-25 13:57:49 +02:00
Florian Renaud
dee8484618 Create local room state events in dedicated task 2022-08-25 13:57:49 +02:00
Florian Renaud
7216f6bd64 Fix local events generation following the specification 2022-08-25 13:57:49 +02:00
Florian Renaud
5df71c6161 Update CreateRoomParams from the potential FeaturePreset before persisting 2022-08-25 13:57:49 +02:00
Florian Renaud
c96343f1d7 Persists CreateRoomParams into LocalRoomSummaryEntity 2022-08-25 13:57:49 +02:00
Florian Renaud
69917ebc2e Start DM - Handle third party invites 2022-08-25 13:57:49 +02:00
Florian Renaud
b14e3c61b3 Start DM - Fix first message not encrypted 2022-08-25 13:57:49 +02:00
Florian Renaud
72896f1c8a Create the DM when sending an event 2022-08-25 13:57:49 +02:00
Benoit Marty
66a6018a93 Detekt 2022-08-24 14:06:35 +02:00
SpiritCroc
16ca0951ca Move viewpager debugging visual feedback to own pref 
Visual feedback probably not needed for the remaining viewpager issues.

Change-Id: I9931c37b9d0c79ba9fd2f27782d0c0eaa5dfd318
 2022-08-24 10:22:57 +02:00
Benoit Marty
2c63dee86a Avoid trying to log formatted Json if Http bodies are not logged. 2022-08-24 10:16:57 +02:00
SpiritCroc
e6023c6bae Merge tag 'v1.4.34' into sc 
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
 2022-08-24 10:14:36 +02:00
Benoit Marty
8cec528ac7 Only one FormatterJsonHttpLogger implementation is required. 2022-08-24 10:11:24 +02:00
Benoit Marty
973a5f1d6e Version++ 2022-08-23 17:02:24 +02:00
Benoit Marty
6c2885ff39 Granfra's review 2022-08-23 16:36:39 +02:00
Benoit Marty
58954ed590 Fix Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. 
See for instance https://github.com/matrix-org/element-android-rageshakes/issues/41975
 2022-08-23 15:36:17 +02:00
Benoit Marty
aa750cccbf typo 2022-08-23 12:03:25 +02:00
Benoit Marty
1a79828aa5 Update comment 2022-08-23 12:01:43 +02:00
Benoit Marty
5c02290ad4 Fix logging issue 2022-08-23 12:00:27 +02:00
Benoit Marty
e3f5d15eaf Do not fetch user if we do not have the previous content. 2022-08-23 11:19:14 +02:00
Benoit Marty
94a87744ac Defer the treatment of updating the User profiles to a background Worker. 2022-08-23 11:11:40 +02:00
Adam Brown
b50b6daca1 using wider range network error when deciding to forward to the edit server instead of just unknown host 
- will also capture timeouts
 2022-08-22 17:24:11 +01:00
Adam Brown
841ee33c82
Merge pull request #6837 from vector-im/feature/adm/missing-notifications 
Missing notifications due to stuck background workers
 2022-08-22 17:20:04 +01:00
Benoit Marty
a7666e2112 Set instead of List, to avoid duplication. 2022-08-22 17:45:28 +02:00
Benoit Marty
9a0ea7bc2e Add some log for further investigation 2022-08-22 17:45:28 +02:00
Benoit Marty
13f7a9fc10 Performance: invoke UpdateTrustWorker only once per incremental sync. 2022-08-22 17:45:28 +02:00