Commit Graph

16573 Commits

Author SHA1 Message Date
Onuray Sahin 04679ea21d Merge branch 'develop' into feature/ons/live_location_bottom_sheet
* develop: (114 commits)
  Docs: Fix various formatting and spelling issues in notifications.md
  Fixing non necessary breaking line
  continuing to the originally supplied url when a rtl override character is detected
  splitting url detection condition into separate branches
  Cleaner code
  Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise.
  Add changelog
  Fix test compilation
  Add some Kdoc
  Add some Kdoc
  Create SpaceFilter.OrphanRooms to improve the API. Not 100% of the side effect. There is probably some (fixed?) bugs here.
  Rename ActiveSpaceFilter to SpaceFilter
  Remove `ActiveSpaceFilter.None` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  Add some Kdoc
  Remove duplicated lines of code (the same code is done a few lines later)
  Remove `RoomCategoryFilter.ALL` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  `displayName` default value is now `QueryStringValue.NoCondition`. It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
  Small rework for nicer code
  Remove duplicated code lines
  Remove `roomId` from `RoomSummaryQueryParams.Builder()`. Create a new API in RoomService to observe a room summary from a roomId.
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
2022-05-30 16:27:11 +03:00
Aris Kotsomitopoulos 9a756f2b7a
Merge pull request #6168 from vector-im/feature/aris/threads_update_icons
Fix wrong rendered vector icon
2022-05-30 15:59:18 +03:00
SpiritCroc 0670c3c6ee Update unit test for imageUriString 2022-05-30 14:55:08 +02:00
Benoit Marty fb884e29b5 Update the title, since knit is not clever enough to handle `&`.
And run `.gradlew knit` again to update the toc.
2022-05-30 14:41:41 +02:00
Onuray Sahin 21abc3fa77 Code review fixes. 2022-05-30 15:40:36 +03:00
Benoit Marty aa9b5ce0bd Call `./gradlew knit` to generate the TOC 2022-05-30 14:35:11 +02:00
Benoit Marty bc7a50124f Setup knit TOC.
Only ## and more heading will be listed, so add a "h" level.
2022-05-30 14:34:32 +02:00
Benoit Marty 3d437f94f1 Call `./gradlew knit` to regenerate the TOC 2022-05-30 14:31:31 +02:00
Benoit Marty b3a5812a61 Setup knit TOC.
Only ## and more heading will be listed, so add a "h" level.
2022-05-30 14:30:28 +02:00
Benoit Marty 828e13f9be
Merge pull request #6182 from networkException/notification-documentation-fixes
Docs: Fix various formatting and spelling issues in notifications.md
2022-05-30 14:26:57 +02:00
Benoit Marty a94bea3b91
Merge pull request #6173 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.2
Bump kotlinCoroutines from 1.6.1 to 1.6.2
2022-05-30 14:23:22 +02:00
Benoit Marty 816be72386
Merge pull request #6181 from vector-im/dependabot/gradle/vanniktechEmoji-0.15.0
Bump vanniktechEmoji from 0.13.0 to 0.15.0
2022-05-30 14:08:12 +02:00
Benoit Marty ab651cbe50
Merge pull request #6164 from vector-im/bug/adm/link-checking
Ask the user to confirm urls which contain unicode direction overrides
2022-05-30 14:07:23 +02:00
networkException 609cdf72ae
Docs: Fix various formatting and spelling issues in notifications.md
Signed-off-by: networkException <git@nwex.de>
2022-05-30 13:38:53 +02:00
SpiritCroc 292020e95d Fix some notifications never getting dismissed
Persisting notification info fails for non-null Uris:

E NotificationEventPersistence: ## Failed to save cached notification info
E NotificationEventPersistence: java.io.NotSerializableException: android.net.Uri$HierarchicalUri
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1240)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1604)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1565)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at java.util.ArrayList.writeObject(ArrayList.java:762)
E NotificationEventPersistence: 	at java.lang.reflect.Method.invoke(Native Method)
E NotificationEventPersistence: 	at java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:1036)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1552)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.saveSecureObjectM(SecretStoringUtils.kt:283)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.securelyStoreObject(SecretStoringUtils.kt:150)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService.securelyStoreObject(DefaultSecureStorageService.kt:27)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationEventPersistence.persistEvents(NotificationEventPersistence.kt:58)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:183)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationState.queuedEvents(NotificationState.kt:55)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.persistEvents(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.refreshNotificationDrawerBg(NotificationDrawerManager.kt:177)

Accordingly, if a notification for an image is shown, and the
notification state is loaded from storage later, none of the previously
shown notifications will get dismissed once read.

Likely addresses https://github.com/vector-im/element-android/issues/4862.

Change-Id: I2d6be497e8b92e770b680e16e42b3610add57323
2022-05-30 13:06:09 +02:00
Onuray Sahin aa344b1ecd Code documentation. 2022-05-30 13:56:17 +03:00
Maxime NATUREL eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins
[Location sharing] - Show user live location pins in map view (PSF-1019)
2022-05-30 12:32:09 +02:00
Onuray Sahin b262aad3a8 Remove unused layout. 2022-05-30 13:24:31 +03:00
Benoit Marty 17ccccc6e6
Merge pull request #6143 from vector-im/feature/bma/cleanup_RoomSummaryQueryParams
Cleanup room summary query params
2022-05-30 12:22:26 +02:00
Maxime NATUREL 538c099913 Fixing non necessary breaking line 2022-05-30 11:44:03 +02:00
Adam Brown 67f1929784 continuing to the originally supplied url when a rtl override character is detected 2022-05-30 10:42:42 +01:00
Adam Brown e6198d7bf6 splitting url detection condition into separate branches 2022-05-30 10:38:42 +01:00
Benoit Marty ec498cf054 Cleaner code 2022-05-30 11:38:31 +02:00
Benoit Marty c071dc502e Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise. 2022-05-30 11:38:31 +02:00
Benoit Marty d7a1ae3a00 Add changelog 2022-05-30 11:38:03 +02:00
Benoit Marty ad60467ae7 Fix test compilation 2022-05-30 11:38:03 +02:00
Benoit Marty cffdb7f7a6 Add some Kdoc 2022-05-30 11:38:03 +02:00
Benoit Marty 5fbcec0c9c Add some Kdoc 2022-05-30 11:34:55 +02:00
Benoit Marty 0b6f35b256 Create SpaceFilter.OrphanRooms to improve the API.
Not 100% of the side effect. There is probably some (fixed?) bugs here.
2022-05-30 11:34:55 +02:00
Benoit Marty c7997edf9a Rename ActiveSpaceFilter to SpaceFilter 2022-05-30 11:34:55 +02:00
Benoit Marty 00809027c1 Remove `ActiveSpaceFilter.None`
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
Benoit Marty 289f27b738 Add some Kdoc 2022-05-30 11:34:55 +02:00
Benoit Marty 3442829e11 Remove duplicated lines of code (the same code is done a few lines later) 2022-05-30 11:34:55 +02:00
Benoit Marty 8843fe0a54 Remove `RoomCategoryFilter.ALL`
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
Benoit Marty 8d7a54a6cf `displayName` default value is now `QueryStringValue.NoCondition`.
It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
2022-05-30 11:34:55 +02:00
Benoit Marty 2b0077b138 Small rework for nicer code 2022-05-30 11:34:55 +02:00
Benoit Marty 6a728e3851 Remove duplicated code lines 2022-05-30 11:34:55 +02:00
Benoit Marty bfdc885d7f Remove `roomId` from `RoomSummaryQueryParams.Builder()`.
Create a new API in RoomService to observe a room summary from a roomId.
2022-05-30 11:34:55 +02:00
Benoit Marty 49a29fb56f Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
Benoit Marty 12b3afbc50 Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
Maxime NATUREL 1756fa26e1 Using @AndroidEntryPoint for map fragment 2022-05-30 11:21:23 +02:00
Eric Decanini eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader
Replaces subtitle in Search Rooms with room context rather than last event
2022-05-30 11:13:10 +02:00
Adam Brown d18e7ad001 Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes 2022-05-30 10:07:43 +01:00
Eric Decanini b8c0c61a4c
Merge pull request #6073 from vector-im/feature/eric/improve-back-navigation
Adds up navigation in spaces
2022-05-30 10:38:28 +02:00
Maxime NATUREL 7f2279c8a8 Improving view state mapper 2022-05-30 10:37:58 +02:00
Adam Brown ead189a9c7 temporarily ignoring flaky test when ran on the CI 2022-05-30 09:37:39 +01:00
Maxime NATUREL 066c540eb7 Filter event id in the DB query for active lives 2022-05-30 10:06:04 +02:00
Maxime NATUREL f707f177d9 Improving mapper tests 2022-05-30 10:03:27 +02:00
dependabot[bot] 174e1fe332
Bump vanniktechEmoji from 0.13.0 to 0.15.0
Bumps `vanniktechEmoji` from 0.13.0 to 0.15.0.

Updates `emoji-material` from 0.13.0 to 0.15.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.13.0...0.15.0)

Updates `emoji-google` from 0.13.0 to 0.15.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.13.0...0.15.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 07:40:59 +00:00
Adam Brown f7f924ce6b
Merge pull request #6175 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.49
Bump libphonenumber from 8.12.48 to 8.12.49
2022-05-30 08:40:23 +01:00