filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-01 04:17:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,753 Commits 7 Branches 124 Tags 229 MiB
969fa9fb26
Commit Graph

3816 Commits

Author SHA1 Message Date
SpiritCroc
57a9ea4617 Merge tag 'v1.3.3' into sc 
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
 2021-10-11 12:42:06 +02:00
SpiritCroc
dffc0c1d65 Merge tag 'v1.3.2' into sc 
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.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/room/timeline/TokenChunkEventPersistor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	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/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
 2021-10-11 09:55:26 +02:00
Benoit Marty
3a387c5e32 version++ 2021-10-08 16:36:48 +02:00
dependabot[bot]
c55598a099
Bump libphonenumber from 8.12.33 to 8.12.34 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.33 to 8.12.34.
- [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.33...v8.12.34)

---
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-10-06 23:07:32 +00:00
SpiritCroc
8c4ef3d9cf Space unread counts: exclude hidden rooms 
This fixes old rooms which have been upgraded to a new room version
persisting in the unread counter.

Change-Id: Ia4eb6fd1b181962ea62d1e996ef18f1bd651a9cd
 2021-10-06 09:06:11 +02:00
Benoit Marty
7ebdd7830a
Merge pull request #4158 from vector-im/feature/bma/new_commands 
Handle new commands
 2021-10-05 13:38:31 +02:00
Benoit Marty
eceb341986
Merge pull request #4034 from vector-im/feature/bma/displayNameFallback 
Add a fallback for user displayName when this one is null or empty
 2021-10-04 23:13:28 +02:00
Benoit Marty
647b09739f Fix test compilation 2021-10-04 22:48:43 +02:00
Benoit Marty
068c9393f1 Create extension String.isMxcUrl() 2021-10-04 16:26:15 +02:00
Benoit Marty
f91936b413
Merge pull request #4156 from vector-im/feature/bma/remove_unused_worker 
Remove unused SendRelationWorker and related API call (3588)
 2021-10-04 16:16:35 +02:00
Benoit Marty
36e4d3ec69 Remove unused SendRelationWorker and related API call (3588) 2021-10-04 15:17:03 +02:00
Benoit Marty
f385e74662 Improve reusability of code 2021-10-04 14:13:25 +02:00
Benoit Marty
7636b4d7a8 limit alias length in candidateAliasFromRoomName() 2021-10-04 12:40:43 +02:00
Benoit Marty
c3b65a9c71 Create MatrixConstants to handle max alias length limitation 2021-10-04 12:30:28 +02:00
Valere
3da5641e2b Client side validation of alias max length 2021-10-04 10:57:54 +02:00
Benoit Marty
0a6b71d27d ktlint 2021-10-04 09:58:14 +02:00
Benoit Marty
9735bc6ee3 Add a fallback for user displayName when this one is null or empty, so that the application can customize the dispay name 2021-10-04 09:55:01 +02:00
SpiritCroc
0d6eda56f5 Update room previews once we have decryption keys 
Change-Id: I9a874d3c15abb4ab1a6e108c298db6cd4ea95f29
 2021-10-03 16:17:27 +02:00
Benoit Marty
57d7ac5bd8
Merge pull request #4139 from vector-im/dependabot/gradle/com.squareup.okhttp3-okhttp-bom-4.9.2 
Bump okhttp-bom from 4.9.1 to 4.9.2
 2021-10-03 11:12:01 +02:00
Benoit Marty
f5375c7af2 Run ./gradlew ktlintFormat 2021-10-02 11:49:28 +02:00
dependabot[bot]
bde45b901f
Bump okhttp-bom from 4.9.1 to 4.9.2 
Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.9.1 to 4.9.2.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.1...parent-4.9.2)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-01 23:07:25 +00:00
Benoit Marty
f7af298654
Merge pull request #3972 from vector-im/feature/fga/expose_sync 
Feature/fga/expose sync
 2021-10-01 20:48:46 +02:00
Benoit Marty
2366227133
Merge pull request #4129 from vector-im/feature/adm/sync-read-notifications 
Fixing notifications not being dismissed when read from other devices
 2021-10-01 18:11:46 +02:00
Benoit Marty
d8203ea27b Optimize import 2021-10-01 18:08:48 +02:00
Benoit Marty
7d59cbebf1
Merge branch 'develop' into feature/fga/expose_sync 2021-10-01 18:04:56 +02:00
Adam Brown
c72f66871f replacing boolean constants with an improved function name + doc around why the events can be missing 2021-10-01 16:22:24 +01:00
Adam Brown
f9d2f236a4 using named parameters when the same types are used in close proximity 2021-10-01 14:43:39 +01:00
Benoit Marty
6983e1be55 Split long lines 2021-10-01 14:24:07 +02:00
Benoit Marty
ba35c0101e Fix compilation error 2021-10-01 14:09:22 +02:00
Benoit Marty
d1e9f3131a Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing" 2021-10-01 13:31:15 +02:00
Benoit Marty
a1caccbcc8 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "chain-wrapping" 2021-10-01 13:31:15 +02:00
Benoit Marty
2ca3c68611 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "import-ordering" 2021-10-01 13:31:15 +02:00
Adam Brown
49e332cb1c formatting 2021-09-30 17:30:23 +01:00
Adam Brown
7105a20f4f fixes notifications not being marked as read when the last chunk containing the event is no longer the latest 
- use explict returns constants to attempt to add more documentation
- queries for the existence of the event in all of the chunk history and if a read receipt exists in the latest chunk (which it should if a user has just read on another client) which allows us to mark old notifications events as read
 2021-09-30 17:15:04 +01:00
ganfra
845c396f8f Clean code after PR review 2021-09-30 16:43:49 +02:00
Benoit Marty
3719382569
Merge pull request #3953 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.6.0 
Bump work-runtime-ktx from 2.5.0 to 2.6.0
 2021-09-30 14:25:43 +02:00
ganfra
be8c6f1836 Merge branch 'develop' into feature/fga/expose_sync 2021-09-30 12:10:38 +02:00
Benoit Marty
3f7e810f14 Handle change from WorkManager 2.6.0. 
https://developer.android.com/jetpack/androidx/releases/work#2.6.0
 2021-09-30 12:06:57 +02:00
SpiritCroc
38ae03893f Merge tag 'v1.3.1' into sc 
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
 2021-09-30 09:27:15 +02:00
Benoit Marty
0033378f8b
Merge pull request #4050 from vector-im/dependabot/gradle/kotlin-1.5.31 
Bump kotlin from 1.5.30 to 1.5.31
 2021-09-29 17:09:39 +02:00
Benoit Marty
c0adde56df
Merge pull request #4027 from vector-im/feature/fre/permalink 
Add client base url support for permalinks
 2021-09-29 17:08:12 +02:00
Benoit Marty
31a7bfed02 version++ 2021-09-29 14:56:10 +02:00
SpiritCroc
0c7981dc26 Revert "Revert "Revert "Use Java 11 source code""" 
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.

Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72

Conflicts:
	attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android-rx/build.gradle
	matrix-sdk-android/build.gradle
	vector/build.gradle
 2021-09-29 09:56:32 +02:00
SpiritCroc
4f93eb041c Merge tag 'v1.3.0' into sc 
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68

Conflicts:
	gradle.properties
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/res/layout/reaction_button.xml
 2021-09-29 09:55:02 +02:00
SpiritCroc
b51bd743c7 Revert "Revert "Use Java 11 source code"" 
This will make the latest upstream merge easier.

This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
 2021-09-29 09:13:59 +02:00
Benoit Marty
465b8bfe05 Version++ 2021-09-27 13:11:15 +02:00
SpiritCroc
45c6a4e9ba Restore old hasUnread detection algorithm to include notices 
Change-Id: Ib934a381cad1fec18815e222d61350240ba9d93f
 2021-09-25 17:16:53 +02:00
Benoit Marty
045e4bbf76
Merge pull request #4052 from vector-im/feature/adm/email_notification_toggle 
Add email notification toggle
 2021-09-24 20:42:44 +02:00
Valere
1fed27961a Code review 2021-09-24 19:35:49 +02:00
Valere
0acf90d8cd Code review 2021-09-24 18:12:12 +02:00