diff --git a/CHANGES.md b/CHANGES.md index 3ce4f3ef35..569467b156 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -25,6 +25,7 @@ Bugfix 🐛: - Sent video does not contains duration (#3272) - Properly clean the back stack if the user cancel registration when waiting for email validation - Fix read marker visibility/position when filtering some events + - Fix user invitation in case of restricted profile api (#3306) Translations 🗣: - @@ -35,6 +36,7 @@ SDK API changes ⚠️: Build 🧱: - Upgrade to gradle 7 - https://github.com/Piasy/BigImageViewer is now hosted on mavenCentral() + - Upgrade Realm to version 10.4.0 Test: - diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 4059004394..108240f94d 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -6,13 +6,10 @@ apply plugin: 'realm-android' buildscript { repositories { - // mavenCentral() - //noinspection GrDeprecatedAPIUsage - jcenter() + mavenCentral() } dependencies { - // Stick to this version until https://github.com/realm/realm-java/issues/7402 is fixed - classpath "io.realm:realm-gradle-plugin:10.3.1" + classpath "io.realm:realm-gradle-plugin:10.4.0" } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt index e493adeaf2..05fa24946a 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt @@ -66,6 +66,7 @@ interface ProfileService { /** * Get the combined profile information for this user. * This may return keys which are not limited to displayname or avatar_url. + * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response can be HTTP 403. * @param userId the userId param to look for * */ diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt index 05213b40e5..8770dc8b33 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt @@ -144,10 +144,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration { Timber.d("Step 7 -> 8") val editionOfEventSchema = realm.schema.create("EditionOfEvent") - .apply { - // setEmbedded does not return `this`... - isEmbedded = true - } .addField(EditionOfEventFields.CONTENT, String::class.java) .addField(EditionOfEventFields.EVENT_ID, String::class.java) .setRequired(EditionOfEventFields.EVENT_ID, true) @@ -162,6 +158,10 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration { ?.removeField("lastEditTs") ?.removeField("sourceLocalEchoEvents") ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema) + + // This has to be done once a parent use the model as a child + // See https://github.com/realm/realm-java/issues/7402 + editionOfEventSchema.isEmbedded = true } private fun migrateTo9(realm: DynamicRealm) { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt index 5113b821e8..485a4973ca 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt @@ -33,6 +33,7 @@ internal interface ProfileAPI { * Get the combined profile information for this user. * This API may be used to fetch the user's own profile information or other users; either locally or on remote homeservers. * This API may return keys which are not limited to displayname or avatar_url. + * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response can be HTTP 403. * @param userId the user id to fetch profile info */ @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}") diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt index a68717ea57..5d5247ec06 100644 --- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt @@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.MatrixPatterns import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.profile.ProfileService import org.matrix.android.sdk.api.session.user.model.User -import org.matrix.android.sdk.api.util.Optional import org.matrix.android.sdk.api.util.toMatrixItem import org.matrix.android.sdk.api.util.toOptional import org.matrix.android.sdk.rx.rx @@ -137,7 +136,15 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User avatarUrl = json[ProfileService.AVATAR_URL_KEY] as? String ).toOptional() } - .onErrorReturn { Optional.empty() } + .onErrorReturn { + // Profile API can be restricted and doesn't have to return result. + // In this case allow inviting valid user ids. + User( + userId = search, + displayName = null, + avatarUrl = null + ).toOptional() + } Single.zip( searchObservable,